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

aider: Added cmd_commit method to commit outstanding changes to the chat files with a sensible commit message.

Browse source 
# Context:
USER: finish implementing cmd_commit
ASSISTANT: To finish implementing the `cmd_commit` method in the `Coder` class, you can add the following code to `aider/coder.py`. This method will commit outstanding changes to the chat files with a sensible commit message.

```python
aider/coder.py
<<<<<<< ORIGINAL
    def cmd_commit(self, args):
        "Commit outstanding changes to the chat files with a sensible commit message"
=======
    def cmd_commit(self, args):
        "Commit outstanding changes to the chat files with a sensible commit message"
        if not self.repo:
            self.console.print("[red]No git repository found.")
            return

        if not self.repo.is_dirty():
            self.console.print("[red]No changes to commit.")
            return

        commit_message = args.strip()
        if not commit_message:
            commit_message = "aider: Manual commit of outstanding changes"

        self.repo.git.add(*[os.path.relpath(fname, self.repo.working_tree_dir) for fname in self.fnames])
        self.repo.git.commit("-m", commit_message, "--no-verify")
        commit_hash = self.repo.head.commit.hexsha[:7]
        self.console.print(f"[red]{commit_hash} {commit_message}")
>>>>>>> UPDATED
```

This code checks if there is a git repository and if there are any outstanding changes. If there are changes, it commits them with the provided commit message or a default one if no message is provided.
This commit is contained in:
Paul Gauthier 2023-05-10 12:39:45 -07:00
parent cfd27c84e9
commit 6b24072973
1 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

21
aider/coder.py
View file

@ -486,6 +486,24 @@ class Coder:
return files return files
def cmd_commit(self, args):
"Commit outstanding changes to the chat files with a sensible commit message"
if not self.repo:
self.console.print("[red]No git repository found.")
return
if not self.repo.is_dirty():
self.console.print("[red]No changes to commit.")
return
commit_message = args.strip()
if not commit_message:
commit_message = "aider: Manual commit of outstanding changes"
self.repo.git.add(*[os.path.relpath(fname, self.repo.working_tree_dir) for fname in self.fnames])
self.repo.git.commit("-m", commit_message, "--no-verify")
commit_hash = self.repo.head.commit.hexsha[:7]
self.console.print(f"[red]{commit_hash} {commit_message}")
def cmd_undo(self, args): def cmd_undo(self, args):
"Undo the last git commit if it was done by aider" "Undo the last git commit if it was done by aider"
if not self.repo: if not self.repo:
@ -494,10 +512,11 @@ class Coder:
last_commit = self.repo.head.commit last_commit = self.repo.head.commit
if not last_commit.message.startswith("aider:") or last_commit.hexsha[:7] != self.last_aider_commit_hash: if not last_commit.message.startswith("aider:") or last_commit.hexsha[:7] != self.last_aider_commit_hash:
self.console.print("[red]The last commit was not made by Aider or the commit hash does not match.") self.console.print("[red]The last commit was not made by aider in this chat session.")
return return
self.repo.git.reset("--hard", "HEAD~1") self.repo.git.reset("--hard", "HEAD~1")
self.console.print(f"[red]Undid the last commit: {last_commit.message.strip()}") self.console.print(f"[red]Undid the last commit: {last_commit.message.strip()}")
def cmd_add(self, args): def cmd_add(self, args):
"Add matching files to the chat" "Add matching files to the chat"