diff --git a/git_helper.py b/git_helper.py index 085fa824..6c9c2a9f 100644 --- a/git_helper.py +++ b/git_helper.py @@ -437,35 +437,6 @@ def setup_environment(): git.Git().update_environment(GIT_PYTHON_GIT_EXECUTABLE=config['default']['git_exe']) -def is_git_repo(path: str) -> bool: - """ Check if the path is a git repository. """ - try: - # Try to create a Repo object from the path - _ = git.Repo(path).git_dir - return True - except git.exc.InvalidGitRepositoryError: - return False - - -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: - return line - - return "unknown" - - setup_environment() diff --git a/glob/git_utils.py b/glob/git_utils.py new file mode 100644 index 00000000..82bc9f21 --- /dev/null +++ b/glob/git_utils.py @@ -0,0 +1,32 @@ +import os + +import git + + +def is_git_repo(path: str) -> bool: + """ Check if the path is a git repository. """ + try: + # Try to create a Repo object from the path + _ = git.Repo(path).git_dir + return True + except git.exc.InvalidGitRepositoryError: + return False + + +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: + return line + + return "unknown" diff --git a/glob/node_package.py b/glob/node_package.py index 9de8d37a..c2d0d381 100644 --- a/glob/node_package.py +++ b/glob/node_package.py @@ -5,7 +5,7 @@ import os import toml -from git_helper import is_git_repo, get_commit_hash +from git_utils import is_git_repo, get_commit_hash @dataclass