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

fix: Preserve original path spelling for read-only files

Browse source
This commit is contained in:
Paul Gauthier (aider) 2025-05-08 14:30:31 -07:00
parent 1d5c3c3a2b
commit 9297ee982d
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
aider/commands.py
View file

@ -435,11 +435,20 @@ class Commands:
to_keep = set() to_keep = set()
for abs_fname in self.coder.abs_read_only_fnames: for abs_fname in self.coder.abs_read_only_fnames:
rel_fname = self.coder.get_rel_fname(abs_fname) rel_fname = self.coder.get_rel_fname(abs_fname)
keep = any(
_paths_match(abs_fname, orig) or rel_fname == orig # Prefer to keep the *original* spelling that the user supplied
for orig in self.original_read_only_fnames # (eg the /var/… symlink) rather than the canonicalised path we
) # may have stored internally. This preserves exactly what the
if keep: # user (and the tests) expect to see.
kept_name = None
for orig in self.original_read_only_fnames:
if _paths_match(abs_fname, orig) or rel_fname == orig:
kept_name = str(orig)
break
if kept_name:
to_keep.add(kept_name)
else:
to_keep.add(abs_fname) to_keep.add(abs_fname)
self.coder.abs_read_only_fnames = to_keep self.coder.abs_read_only_fnames = to_keep
else: else: