dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-25 14:55:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Adopt safe_abs_path

Browse source
This commit is contained in:
Paul Gauthier 2023-07-07 17:17:33 -07:00
parent 4b3fdc0f88
commit 2c32fe5eb8
2 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
aider/coders/base_coder.py
View file

@ -208,7 +208,14 @@ class Coder:
else: else:
self.root = os.getcwd() self.root = os.getcwd()
self.root = os.path.abspath(self.root) self.root = utils.safe_abs_path(self.root)
def add_rel_fname(self, rel_fname):
self.abs_fnames.add(self.abs_root_path(rel_fname))
def abs_root_path(self, path):
res = Path(self.root) / path
return utils.safe_abs_path(res)
def set_repo(self, cmd_line_fnames): def set_repo(self, cmd_line_fnames):
if not cmd_line_fnames: if not cmd_line_fnames:
@ -226,7 +233,7 @@ class Coder:
try: try:
repo_path = git.Repo(fname, search_parent_directories=True).working_dir repo_path = git.Repo(fname, search_parent_directories=True).working_dir
repo_path = os.path.abspath(repo_path) repo_path = utils.safe_abs_path(repo_path)
repo_paths.append(repo_path) repo_paths.append(repo_path)
except git.exc.InvalidGitRepositoryError: except git.exc.InvalidGitRepositoryError:
pass pass
@ -247,7 +254,7 @@ class Coder:
# https://github.com/gitpython-developers/GitPython/issues/427 # https://github.com/gitpython-developers/GitPython/issues/427
self.repo = git.Repo(repo_paths.pop(), odbt=git.GitDB) self.repo = git.Repo(repo_paths.pop(), odbt=git.GitDB)
self.root = os.path.abspath(self.repo.working_tree_dir) self.root = utils.safe_abs_path(self.repo.working_tree_dir)
new_files = [] new_files = []
for fname in self.abs_fnames: for fname in self.abs_fnames:
@ -584,7 +591,7 @@ class Coder:
return return
for rel_fname in mentioned_rel_fnames: for rel_fname in mentioned_rel_fnames:
self.abs_fnames.add(os.path.abspath(os.path.join(self.root, rel_fname))) self.add_rel_fname(rel_fname)
return prompts.added_files.format(fnames=", ".join(mentioned_rel_fnames)) return prompts.added_files.format(fnames=", ".join(mentioned_rel_fnames))
@ -906,7 +913,7 @@ class Coder:
def get_all_abs_files(self): def get_all_abs_files(self):
files = self.get_all_relative_files() files = self.get_all_relative_files()
files = [os.path.abspath(os.path.join(self.root, path)) for path in files] files = [self.abs_root_path(path) for path in files]
return files return files
def get_last_modified(self): def get_last_modified(self):
@ -919,7 +926,7 @@ class Coder:
return set(self.get_all_relative_files()) - set(self.get_inchat_relative_files()) return set(self.get_all_relative_files()) - set(self.get_inchat_relative_files())
def allowed_to_edit(self, path, write_content=None): def allowed_to_edit(self, path, write_content=None):
full_path = os.path.abspath(os.path.join(self.root, path)) full_path = self.abs_root_path(path)
if full_path in self.abs_fnames: if full_path in self.abs_fnames:
if write_content: if write_content:

8
aider/utils.py
View file

@ -1,6 +1,14 @@
from pathlib import Path
from .dump import dump # noqa: F401 from .dump import dump # noqa: F401
def safe_abs_path(res):
"Gives an abs path, which safely returns a full (not 8.3) windows path"
res = Path(res).resolve()
return str(res)
def show_messages(messages, title=None, functions=None): def show_messages(messages, title=None, functions=None):
if title: if title:
print(title.upper(), "*" * 50) print(title.upper(), "*" * 50)