wangbo/ComfyUI-Manager
1
0
Fork 0
mirror of https://github.com/Comfy-Org/ComfyUI-Manager.git synced 2025-12-17 02:12:58 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

robust update patch

Browse Source
This commit is contained in:
dr.lt.data 2023-07-25 12:35:42 +09:00
parent c0164cc7cd
commit f534cf27e6
5 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
__init__.py
View File

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

6
extension-node-map.json
View File

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

5
git_helper.py
View File

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

2
scanner.py
View File

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

8
scripts/update-fix.py Normal file
View File

@ -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)