robust update patch

__init__.py

@@ -32,7 +32,7 @@ sys.path.append('../..')
 from torchvision.datasets.utils import download_url
 
 # ensure .js
-print("### Loading: ComfyUI-Manager (V0.14)")
+print("### Loading: ComfyUI-Manager (V0.15)")
 
 comfy_ui_revision = "Unknown"
 
@@ -183,8 +183,11 @@ def git_pull(path):
         return __win_check_git_pull(path)
     else:
         repo = git.Repo(path)
+        if repo.is_dirty():
+            repo.git.stash()
+
         origin = repo.remote(name='origin')
-        origin.pull()
+        origin.pull(rebase=True)
         repo.git.submodule('update', '--init', '--recursive')
         
         repo.close()

extension-node-map.json

@@ -1,7 +1,8 @@
 {
     "https://github.com/ArtVentureX/comfyui-animatediff": [
         "AnimateDiffCombine",
-        "AnimateDiffLoader"
+        "AnimateDiffLoader",
+        "AnimatedDiffUnload"
     ],
     "https://github.com/BadCafeCode/masquerade-nodes-comfyui": [
         "Blur",
@@ -415,9 +416,6 @@
         "SeargeSDXLPromptEncoder",
         "SeargeSDXLSampler"
     ],
-    "https://github.com/Ser-Hilary/SDXL_sizing/raw/main/conditioning_sizing_for_SDXL.py": [
-        "sizing_node"
-    ],
     "https://github.com/TinyTerra/ComfyUI_tinyterraNodes.git": [
         "ttN busIN",
         "ttN busOUT",

git_helper.py

@@ -47,8 +47,11 @@ def gitpull(path):
 
     # Pull the latest changes from the remote repository
     repo = git.Repo(path)
+    if repo.is_dirty():
+        repo.git.stash()
+
     origin = repo.remote(name='origin')
-    origin.pull()
+    origin.pull(rebase=True)
     repo.git.submodule('update', '--init', '--recursive')
 
     repo.close()

scanner.py

@@ -117,7 +117,7 @@ def clone_or_pull_git_repository(git_url):
         try:
             repo = Repo(repo_dir)
             origin = repo.remote(name="origin")
-            origin.pull()
+            origin.pull(rebase=True)
             repo.git.submodule('update', '--init', '--recursive')
             print(f"Pulling {repo_name}...")
         except Exception as e:

scripts/update-fix.py

@@ -0,0 +1,8 @@
+import git
+
+repo_path = "."
+if repo.is_dirty():
+    repo.git.stash()
+
+repo = git.Repo(repo_path)
+repo.git.pull(rebase=True)