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 4

convert git.ls_files() to appropriate os.sep, since git always normalizes to /

Browse source
This commit is contained in:
Paul Gauthier 2023-07-05 13:29:13 -07:00
parent 83887070f4
commit 21efc8d59e
1 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

35
aider/coders/base_coder.py
View file

@ -111,6 +111,7 @@ class Coder:
map_tokens=1024, map_tokens=1024,
verbose=False, verbose=False,
assistant_output_color="blue", assistant_output_color="blue",
code_theme="default",
stream=True, stream=True,
use_git=True, use_git=True,
): ):
@ -135,6 +136,7 @@ class Coder:
self.auto_commits = auto_commits self.auto_commits = auto_commits
self.dirty_commits = dirty_commits self.dirty_commits = dirty_commits
self.assistant_output_color = assistant_output_color self.assistant_output_color = assistant_output_color
self.code_theme = code_theme
self.dry_run = dry_run self.dry_run = dry_run
self.pretty = pretty self.pretty = pretty
@ -239,38 +241,36 @@ class Coder:
return return
# https://github.com/gitpython-developers/GitPython/issues/427 # https://github.com/gitpython-developers/GitPython/issues/427
repo = git.Repo(repo_paths.pop(), odbt=git.GitDB) self.repo = git.Repo(repo_paths.pop(), odbt=git.GitDB)
self.root = repo.working_tree_dir self.root = self.repo.working_tree_dir
new_files = [] new_files = []
for fname in self.abs_fnames: for fname in self.abs_fnames:
relative_fname = self.get_rel_fname(fname) relative_fname = self.get_rel_fname(fname)
tracked_files = set(repo.git.ls_files().splitlines()) tracked_files = set(self.get_tracked_files())
if relative_fname not in tracked_files: if relative_fname not in tracked_files:
new_files.append(relative_fname) new_files.append(relative_fname)
if new_files: if new_files:
rel_repo_dir = os.path.relpath(repo.git_dir, os.getcwd()) rel_repo_dir = os.path.relpath(self.repo.git_dir, os.getcwd())
self.io.tool_output(f"Files not tracked in {rel_repo_dir}:") self.io.tool_output(f"Files not tracked in {rel_repo_dir}:")
for fn in new_files: for fn in new_files:
self.io.tool_output(f" - {fn}") self.io.tool_output(f" - {fn}")
if self.io.confirm_ask("Add them?"): if self.io.confirm_ask("Add them?"):
for relative_fname in new_files: for relative_fname in new_files:
repo.git.add(relative_fname) self.repo.git.add(relative_fname)
self.io.tool_output(f"Added {relative_fname} to the git repo") self.io.tool_output(f"Added {relative_fname} to the git repo")
show_files = ", ".join(new_files) show_files = ", ".join(new_files)
commit_message = f"Added new files to the git repo: {show_files}" commit_message = f"Added new files to the git repo: {show_files}"
repo.git.commit("-m", commit_message, "--no-verify") self.repo.git.commit("-m", commit_message, "--no-verify")
commit_hash = repo.head.commit.hexsha[:7] commit_hash = self.repo.head.commit.hexsha[:7]
self.io.tool_output(f"Commit {commit_hash} {commit_message}") self.io.tool_output(f"Commit {commit_hash} {commit_message}")
else: else:
self.io.tool_error("Skipped adding new files to the git repo.") self.io.tool_error("Skipped adding new files to the git repo.")
return return
self.repo = repo
# fences are obfuscated so aider can modify this file! # fences are obfuscated so aider can modify this file!
fences = [ fences = [
("``" + "`", "``" + "`"), ("``" + "`", "``" + "`"),
@ -679,7 +679,9 @@ class Coder:
show_resp = self.render_incremental_response(True) show_resp = self.render_incremental_response(True)
if self.pretty: if self.pretty:
show_resp = Markdown(show_resp, style=self.assistant_output_color, code_theme="default") show_resp = Markdown(
show_resp, style=self.assistant_output_color, code_theme=self.code_theme
)
else: else:
show_resp = Text(show_resp or "<no response>") show_resp = Text(show_resp or "<no response>")
@ -735,7 +737,7 @@ class Coder:
if not show_resp: if not show_resp:
return return
md = Markdown(show_resp, style=self.assistant_output_color, code_theme="default") md = Markdown(show_resp, style=self.assistant_output_color, code_theme=self.code_theme)
live.update(md) live.update(md)
def render_incremental_response(self, final): def render_incremental_response(self, final):
@ -890,7 +892,7 @@ class Coder:
def get_all_relative_files(self): def get_all_relative_files(self):
if self.repo: if self.repo:
files = self.repo.git.ls_files().splitlines() files = self.get_tracked_files()
else: else:
files = self.get_inchat_relative_files() files = self.get_inchat_relative_files()
@ -934,7 +936,7 @@ class Coder:
# Check if the file is already in the repo # Check if the file is already in the repo
if self.repo: if self.repo:
tracked_files = set(self.repo.git.ls_files().splitlines()) tracked_files = set(self.get_tracked_files())
relative_fname = self.get_rel_fname(full_path) relative_fname = self.get_rel_fname(full_path)
if relative_fname not in tracked_files and self.io.confirm_ask(f"Add {path} to git?"): if relative_fname not in tracked_files and self.io.confirm_ask(f"Add {path} to git?"):
if not self.dry_run: if not self.dry_run:
@ -945,6 +947,13 @@ class Coder:
return full_path return full_path
def get_tracked_files(self):
# convert to appropriate os.sep, since git always normalizes to /
files = set(self.repo.git.ls_files().splitlines())
if os.sep == "/":
return
return set(path.replace("/", os.sep) for path in files)
apply_update_errors = 0 apply_update_errors = 0
def apply_updates(self): def apply_updates(self):