dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-28 00:05:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

refactor: consolidate git error handling with ANY_GIT_ERROR constant

Browse source
This commit is contained in:
Paul Gauthier 2024-08-31 08:41:32 -07:00 • committed by Paul Gauthier (aider)
parent 5a6f7b3cd1
commit 5781f91649
4 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
aider/repo.py
View file

@ -15,6 +15,9 @@ class UnableToCountRepoFiles(Exception):
pass
ANY_GIT_ERROR = (git.exc.ODBError, git.exc.GitError)
class GitRepo:
repo = None
aider_ignore_file = None
@ -71,7 +74,7 @@ class GitRepo:
repo_path = git.Repo(fname, search_parent_directories=True).working_dir
repo_path = utils.safe_abs_path(repo_path)
repo_paths.append(repo_path)
except (git.exc.ODBError, git.exc.GitError):
except ANY_GIT_ERROR:
pass
num_repos = len(set(repo_paths))
@ -205,7 +208,7 @@ class GitRepo:
try:
commits = self.repo.iter_commits(active_branch)
current_branch_has_commits = any(commits)
except (git.exc.ODBError, git.exc.GitError):
except ANY_GIT_ERROR:
pass
except TypeError:
pass
@ -373,7 +376,7 @@ class GitRepo:
def get_head_commit(self):
try:
return self.repo.head.commit
except (ValueError, git.exc.ODBError, git.exc.GitError):
except (ValueError,) + ANY_GIT_ERROR:
return None
def get_head_commit_sha(self, short=False):