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

Printed the commit message of the undone commit and the hash and commit message of the current HEAD after the undo operation.

Browse source
This commit is contained in:
Paul Gauthier (aider) 2024-07-05 13:06:49 -03:00
parent d0267f0ece
commit 9e90dbc20d
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
aider/commands.py
View file

@ -331,6 +331,7 @@ class Commands:
return return
last_commit_hash = self.coder.repo.repo.head.commit.hexsha[:7] last_commit_hash = self.coder.repo.repo.head.commit.hexsha[:7]
last_commit_message = self.coder.repo.repo.head.commit.message.strip()
if last_commit_hash not in self.coder.aider_commit_hashes: if last_commit_hash not in self.coder.aider_commit_hashes:
self.io.tool_error("The last commit was not made by aider in this chat session.") self.io.tool_error("The last commit was not made by aider in this chat session.")
self.io.tool_error( self.io.tool_error(
@ -346,7 +347,14 @@ class Commands:
self.coder.repo.repo.git.reset("--soft", "HEAD~1") self.coder.repo.repo.git.reset("--soft", "HEAD~1")
self.io.tool_output( self.io.tool_output(
f"Commit `{last_commit_hash}` was reset and removed from git.\n" f"Commit `{last_commit_hash}` with message '{last_commit_message}' was reset and removed from git."
)
# Get the current HEAD after undo
current_head_hash = self.coder.repo.repo.head.commit.hexsha[:7]
current_head_message = self.coder.repo.repo.head.commit.message.strip()
self.io.tool_output(
f"Current HEAD is now `{current_head_hash}` with message '{current_head_message}'."
) )
if self.coder.main_model.send_undo_reply: if self.coder.main_model.send_undo_reply: