This commit is contained in:
Paul Gauthier 2023-07-25 09:19:01 -03:00
parent 53e332526b
commit 5bb3935f7e

View file

@ -12,7 +12,7 @@ from aider.io import InputOutput
from aider.repo import GitRepo from aider.repo import GitRepo
from aider.versioncheck import check_version from aider.versioncheck import check_version
from .dump import dump # noqa: F402 from .dump import dump # noqa: F401
def get_git_root(): def get_git_root():
@ -27,15 +27,11 @@ def get_git_root():
def guessed_wrong_repo(io, git_root, fnames, git_dname): def guessed_wrong_repo(io, git_root, fnames, git_dname):
"""After we parse the args, we can determine the real repo. Did we guess wrong?""" """After we parse the args, we can determine the real repo. Did we guess wrong?"""
dump(git_root)
try: try:
check_repo = Path(GitRepo(io, fnames, git_dname).root).resolve() check_repo = Path(GitRepo(io, fnames, git_dname).root).resolve()
except FileNotFoundError: except FileNotFoundError:
return return
dump(check_repo)
# we had no guess, rely on the "true" repo result # we had no guess, rely on the "true" repo result
if not git_root: if not git_root:
return str(check_repo) return str(check_repo)
@ -44,10 +40,6 @@ def guessed_wrong_repo(io, git_root, fnames, git_dname):
if check_repo == git_root: if check_repo == git_root:
return return
print("guessed the wrong repo")
dump(check_repo)
dump(git_root)
return str(check_repo) return str(check_repo)
@ -434,7 +426,6 @@ def main(argv=None, input=None, output=None, force_git_root=None):
if args.git and not force_git_root: if args.git and not force_git_root:
right_repo_root = guessed_wrong_repo(io, git_root, fnames, git_dname) right_repo_root = guessed_wrong_repo(io, git_root, fnames, git_dname)
if right_repo_root: if right_repo_root:
print("guessed wrong")
return main(argv, input, output, right_repo_root) return main(argv, input, output, right_repo_root)
io.tool_output(f"Aider v{__version__}") io.tool_output(f"Aider v{__version__}")