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 9

more robust get_tracked_files with pathlib

Browse source
This commit is contained in:
Paul Gauthier 2023-07-05 16:55:37 -07:00
parent c6696e7245
commit e996c56a51
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
aider/coders/base_coder.py
View file

@ -955,10 +955,8 @@ class Coder:
def get_tracked_files(self): def get_tracked_files(self):
# convert to appropriate os.sep, since git always normalizes to / # convert to appropriate os.sep, since git always normalizes to /
files = set(self.repo.git.ls_files().splitlines()) files = set(self.repo.git.ls_files().splitlines())
# return files res = set(str(Path(PurePosixPath(path))) for path in files)
if os.sep == "/": return res
return files
return set(path.replace("/", os.sep) for path in files)
apply_update_errors = 0 apply_update_errors = 0

2
tests/test_main.py
View file

@ -55,7 +55,7 @@ class TestMain(TestCase):
# This will throw a git error on windows if get_tracked_files doesn't # This will throw a git error on windows if get_tracked_files doesn't
# properly convert git/posix/paths to git\posix\paths. # properly convert git/posix/paths to git\posix\paths.
# Because aider will try and `git add` a file that's already in the repo. # Because aider will try and `git add` a file that's already in the repo.
main(["--yes", "--verbose", str(fname)], input=DummyInput(), output=DummyOutput()) main(["--yes", str(fname)], input=DummyInput(), output=DummyOutput())
def test_main_args(self): def test_main_args(self):
with patch("aider.main.Coder.create") as MockCoder: with patch("aider.main.Coder.create") as MockCoder: