mirror of
https://github.com/Aider-AI/aider.git
synced 2025-05-25 06:44:59 +00:00
refactor: simplify error handling in get_tracked_files method
This commit is contained in:
parent
387df7f1db
commit
c8b2024f8b
2 changed files with 21 additions and 29 deletions
|
@ -17,7 +17,7 @@ from aider.format_settings import format_settings, scrub_sensitive_info
|
|||
from aider.history import ChatSummary
|
||||
from aider.io import InputOutput
|
||||
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.versioncheck import check_version, install_from_main_branch, install_upgrade
|
||||
|
||||
|
@ -301,7 +301,7 @@ def sanity_check_repo(repo, io):
|
|||
try:
|
||||
repo.get_tracked_files()
|
||||
return True
|
||||
except UnableToCountRepoFiles as exc:
|
||||
except ANY_GIT_ERROR as exc:
|
||||
error_msg = str(exc)
|
||||
|
||||
if "version in (1, 2)" in error_msg:
|
||||
|
|
|
@ -10,11 +10,6 @@ from aider.sendchat import simple_send_with_retries
|
|||
|
||||
from .dump import dump # noqa: F401
|
||||
|
||||
|
||||
class UnableToCountRepoFiles(Exception):
|
||||
pass
|
||||
|
||||
|
||||
ANY_GIT_ERROR = (git.exc.ODBError, git.exc.GitError)
|
||||
|
||||
|
||||
|
@ -258,7 +253,6 @@ class GitRepo:
|
|||
if not self.repo:
|
||||
return []
|
||||
|
||||
try:
|
||||
try:
|
||||
commit = self.repo.head.commit
|
||||
except ValueError:
|
||||
|
@ -283,8 +277,6 @@ class GitRepo:
|
|||
res = [fname for fname in files if not self.ignored_file(fname)]
|
||||
|
||||
return res
|
||||
except Exception as e:
|
||||
raise UnableToCountRepoFiles(f"Error getting tracked files: {str(e)}")
|
||||
|
||||
def normalize_path(self, path):
|
||||
orig_path = path
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue