Files
Comfy-Org-ComfyUI-Manager/glob/git_utils.py
T
Perfect Johny 0b3966f050 Compare a snapshot's pins with the installed commit and version (#3426)
Two comparisons in restore_snapshot never matched.

get_commit_hash returned the line of .git/HEAD as it is when HEAD is
detached, with its newline, and the snapshot saved it that way. On
restore the checkout of that text failed, repo_switch_commit returned
None, and the pack was listed as skipped at the commit it had. A pack
is left at a detached HEAD by a restore, so a snapshot taken after one
has this.

For a registry pack, the installed version was compared through v[1],
the path of the pack, where v[0] is the version. Every installed pack
was therefore sent to cnr_switch_version, which asks the registry
before it finds the version unchanged; with the registry out of reach
the request raised and the restore stopped.

- Return the hash without the newline
- Strip the hash read from a snapshot, so the snapshots already saved
  restore too
- Compare the version
- Add tests for the hash, for a pack at the pinned version and at
  another one, and for the checkout of both forms of the hash in a
  real repository

The same change for manager-v4 is #3531.
2026-11-15 11:06:55 +09:00

90 lines
2.7 KiB
Python

import os
import configparser
GITHUB_ENDPOINT = os.getenv('GITHUB_ENDPOINT')
def is_git_repo(path: str) -> bool:
""" Check if the path is a git repository. """
# NOTE: Checking it through `git.Repo` must be avoided.
# It locks the file, causing issues on Windows.
return os.path.exists(os.path.join(path, '.git'))
def get_commit_hash(fullpath):
git_head = os.path.join(fullpath, '.git', 'HEAD')
if os.path.exists(git_head):
with open(git_head) as f:
line = f.readline()
if line.startswith("ref: "):
ref = os.path.join(fullpath, '.git', line[5:].strip())
if os.path.exists(ref):
with open(ref) as f2:
return f2.readline().strip()
else:
return "unknown"
else:
# detached HEAD: the file holds the sha followed by a newline;
# without the strip the pinned hash carries that newline into
# snapshots, and the next restore's checkout of that hash fails
return line.strip()
return "unknown"
def git_url(fullpath):
"""
resolve version of unclassified custom node based on remote url in .git/config
"""
git_config_path = os.path.join(fullpath, '.git', 'config')
if not os.path.exists(git_config_path):
return None
# Set `strict=False` to allow duplicate `vscode-merge-base` sections, addressing <https://github.com/ltdrdata/ComfyUI-Manager/issues/1529>
config = configparser.ConfigParser(strict=False)
config.read(git_config_path)
for k, v in config.items():
if k.startswith('remote ') and 'url' in v:
if 'Comfy-Org/ComfyUI-Manager' in v['url']:
return "https://github.com/ltdrdata/ComfyUI-Manager"
return v['url']
return None
def normalize_url(url) -> str:
github_id = normalize_to_github_id(url)
if github_id is not None:
url = f"https://github.com/{github_id}"
return url
def normalize_to_github_id(url) -> str:
if 'github' in url or (GITHUB_ENDPOINT is not None and GITHUB_ENDPOINT in url):
author = os.path.basename(os.path.dirname(url))
if author.startswith('git@github.com:'):
author = author.split(':')[1]
repo_name = os.path.basename(url)
if repo_name.endswith('.git'):
repo_name = repo_name[:-4]
return f"{author}/{repo_name}"
return None
def get_url_for_clone(url):
url = normalize_url(url)
if GITHUB_ENDPOINT is not None and url.startswith('https://github.com/'):
url = GITHUB_ENDPOINT + url[18:] # url[18:] -> remove `https://github.com`
return url