dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-25 06:44:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

refactor: simplify error handling in get_tracked_files method

Browse source
This commit is contained in:
Paul Gauthier 2024-09-02 16:03:54 -07:00 • committed by Paul Gauthier (aider)
parent 387df7f1db
commit c8b2024f8b
2 changed files with 21 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
aider/main.py
View file

@ -17,7 +17,7 @@ from aider.format_settings import format_settings, scrub_sensitive_info
from aider.history import ChatSummary from aider.history import ChatSummary
from aider.io import InputOutput from aider.io import InputOutput
from aider.llm import litellm # noqa: F401; properly init litellm on launch from aider.llm import litellm # noqa: F401; properly init litellm on launch
from aider.repo import ANY_GIT_ERROR, GitRepo, UnableToCountRepoFiles from aider.repo import ANY_GIT_ERROR, GitRepo
from aider.report import report_uncaught_exceptions from aider.report import report_uncaught_exceptions
from aider.versioncheck import check_version, install_from_main_branch, install_upgrade from aider.versioncheck import check_version, install_from_main_branch, install_upgrade
@ -301,7 +301,7 @@ def sanity_check_repo(repo, io):
try: try:
repo.get_tracked_files() repo.get_tracked_files()
return True return True
except UnableToCountRepoFiles as exc: except ANY_GIT_ERROR as exc:
error_msg = str(exc) error_msg = str(exc)
if "version in (1, 2)" in error_msg: if "version in (1, 2)" in error_msg:

8
aider/repo.py
View file

@ -10,11 +10,6 @@ from aider.sendchat import simple_send_with_retries
from .dump import dump # noqa: F401 from .dump import dump # noqa: F401
class UnableToCountRepoFiles(Exception):
pass
ANY_GIT_ERROR = (git.exc.ODBError, git.exc.GitError) ANY_GIT_ERROR = (git.exc.ODBError, git.exc.GitError)
@ -258,7 +253,6 @@ class GitRepo:
if not self.repo: if not self.repo:
return [] return []
try:
try: try:
commit = self.repo.head.commit commit = self.repo.head.commit
except ValueError: except ValueError:
@ -283,8 +277,6 @@ class GitRepo:
res = [fname for fname in files if not self.ignored_file(fname)] res = [fname for fname in files if not self.ignored_file(fname)]
return res return res
except Exception as e:
raise UnableToCountRepoFiles(f"Error getting tracked files: {str(e)}")
def normalize_path(self, path): def normalize_path(self, path):
orig_path = path orig_path = path