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

Refactor set_repo() to add and commit all new files at once.

Browse source
This commit is contained in:
Paul Gauthier 2023-05-08 21:16:31 -07:00
parent ec486f8504
commit e89588aa01
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
coder.py
View file

@ -87,19 +87,25 @@ class Coder:
self.console.print("[red bold]Files are in different git repos, can't commit edits to allow easy undo") self.console.print("[red bold]Files are in different git repos, can't commit edits to allow easy undo")
return return
new_files = []
for fname in self.fnames: for fname in self.fnames:
relative_fname = os.path.relpath(fname, self.repo.working_tree_dir) relative_fname = os.path.relpath(fname, self.repo.working_tree_dir)
if relative_fname not in self.repo.untracked_files: if relative_fname not in self.repo.untracked_files:
continue continue
question = f"[red bold]Add {fname} to the git repo?" new_files.append(relative_fname)
if new_files:
new_files_str = ', '.join(new_files)
question = f"[red bold]Add the following new files to the git repo? {new_files_str}"
if Confirm.ask(question, console=self.console): if Confirm.ask(question, console=self.console):
self.repo.git.add(relative_fname) for relative_fname in new_files:
self.console.print(f"[red]Added {fname} to the git repo") self.repo.git.add(relative_fname)
commit_message = f"Initial commit: Added {fname} to the git repo." self.console.print(f"[red]Added {relative_fname} to the git repo")
commit_message = f"Initial commit: Added new files to the git repo."
self.repo.git.commit("-m", commit_message, "--no-verify") self.repo.git.commit("-m", commit_message, "--no-verify")
self.console.print(f"[green bold]Committed {fname} with message: {commit_message}") self.console.print(f"[green bold]Committed new files with message: {commit_message}")
else: else:
self.console.print(f"[red]Skipped adding {fname} to the git repo") self.console.print(f"[red]Skipped adding new files to the git repo")
self.repo = git.Repo(repo_paths.pop()) self.repo = git.Repo(repo_paths.pop())