dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-24 22:34:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Tell git to stop quoting the paths in ls-files

Browse source
This commit is contained in:
Paul Gauthier 2023-07-11 08:12:44 -07:00
parent c4e4d071fa
commit 7c0ac4d92f
2 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
aider/coders/base_coder.py
View file

@ -964,9 +964,13 @@ class Coder:
def get_tracked_files(self): def get_tracked_files(self):
if not self.repo: if not self.repo:
return [] return []
files = self.repo.git.execute(["git", "-c", "core.quotepath=off", "ls-files"])
files = set(files.splitlines())
# 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())
res = set(str(Path(PurePosixPath(path))) for path in files) res = set(str(Path(PurePosixPath(path))) for path in files)
return res return res
apply_update_errors = 0 apply_update_errors = 0

16
aider/repomap.py
View file

@ -172,7 +172,10 @@ class RepoMap:
def run_ctags(self, filename): def run_ctags(self, filename):
# Check if the file is in the cache and if the modification time has not changed # Check if the file is in the cache and if the modification time has not changed
file_mtime = os.path.getmtime(filename) file_mtime = self.get_mtime(filename)
if file_mtime is None:
return []
cache_key = filename cache_key = filename
if cache_key in self.TAGS_CACHE and self.TAGS_CACHE[cache_key]["mtime"] == file_mtime: if cache_key in self.TAGS_CACHE and self.TAGS_CACHE[cache_key]["mtime"] == file_mtime:
return self.TAGS_CACHE[cache_key]["data"] return self.TAGS_CACHE[cache_key]["data"]
@ -239,8 +242,17 @@ class RepoMap:
def save_ident_cache(self): def save_ident_cache(self):
pass pass
def get_mtime(self, fname):
try:
return os.path.getmtime(fname)
except FileNotFoundError:
self.io.tool_error(f"File not found error: {fname}")
def get_name_identifiers(self, fname, uniq=True): def get_name_identifiers(self, fname, uniq=True):
file_mtime = os.path.getmtime(fname) file_mtime = self.get_mtime(fname)
if file_mtime is None:
return set()
cache_key = fname cache_key = fname
if cache_key in self.IDENT_CACHE and self.IDENT_CACHE[cache_key]["mtime"] == file_mtime: if cache_key in self.IDENT_CACHE and self.IDENT_CACHE[cache_key]["mtime"] == file_mtime:
idents = self.IDENT_CACHE[cache_key]["data"] idents = self.IDENT_CACHE[cache_key]["data"]