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 9

commit new files to git

Browse source
This commit is contained in:
Paul Gauthier 2023-07-07 08:24:44 -07:00
parent 6a0cff50f8
commit 75b533b4c3
2 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
aider/coders/base_coder.py
View file

@ -954,6 +954,8 @@ class Coder:
return full_path return full_path
def get_tracked_files(self): def get_tracked_files(self):
if not self.repo:
return []
# 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()) 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)

45
aider/commands.py
View file

@ -11,6 +11,8 @@ from prompt_toolkit.completion import Completion
from aider import prompts from aider import prompts
from .dump import dump # noqa: F401
class Commands: class Commands:
def __init__(self, io, coder): def __init__(self, io, coder):
@ -233,36 +235,26 @@ class Commands:
"Add matching files to the chat session using glob patterns" "Add matching files to the chat session using glob patterns"
added_fnames = [] added_fnames = []
git_added = []
git_files = self.coder.get_tracked_files()
for word in args.split(): for word in args.split():
matched_files = self.glob_filtered_to_repo(word) matched_files = self.glob_filtered_to_repo(word)
if not matched_files: if not matched_files:
if any(char in word for char in "*?[]"): if any(char in word for char in "*?[]"):
self.io.tool_error(f"No files matched '{word}' and it contains glob characters") self.io.tool_error(f"No files matched pattern: {word}")
else: elif self.io.confirm_ask(
if self.coder.repo is not None: f"No files matched '{word}'. Do you want to create the file?"
create_file = self.io.confirm_ask( ):
( (Path(self.coder.root) / word).touch()
f"No files matched '{word}'. Do you want to create the file and add" matched_files = [word]
" it to git?"
),
)
else:
create_file = self.io.confirm_ask(
f"No files matched '{word}'. Do you want to create the file?"
)
if create_file:
(Path(self.coder.root) / word).touch()
matched_files = [word]
if self.coder.repo is not None:
self.coder.repo.git.add(os.path.join(self.coder.root, word))
commit_message = f"aider: Created and added {word} to git."
self.coder.repo.git.commit("-m", commit_message, "--no-verify")
else:
self.io.tool_error(f"No files matched '{word}'")
for matched_file in matched_files: for matched_file in matched_files:
if self.coder.repo and matched_file not in git_files:
self.coder.repo.git.add(os.path.join(self.coder.root, matched_file))
git_added.append(matched_file)
abs_file_path = os.path.abspath(os.path.join(self.coder.root, matched_file)) abs_file_path = os.path.abspath(os.path.join(self.coder.root, matched_file))
if abs_file_path not in self.coder.abs_fnames: if abs_file_path not in self.coder.abs_fnames:
content = self.io.read_text(abs_file_path) content = self.io.read_text(abs_file_path)
@ -273,6 +265,13 @@ class Commands:
else: else:
self.io.tool_error(f"{matched_file} is already in the chat") self.io.tool_error(f"{matched_file} is already in the chat")
if self.coder.repo and git_added:
git_added = " ".join(git_added)
commit_message = f"aider: Created {git_added}"
self.coder.repo.git.commit("-m", commit_message, "--no-verify")
commit_hash = self.coder.repo.head.commit.hexsha[:7]
self.io.tool_output(f"Commit {commit_hash} {commit_message}")
if not added_fnames: if not added_fnames:
return return