dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-06-04 19:55:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

allow multiple undo

Browse source
This commit is contained in:
Paul Gauthier 2024-07-05 13:09:05 -03:00
parent 9e90dbc20d
commit 5122121265
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
aider/commands.py
View file

@ -346,16 +346,12 @@ class Commands:
# Move the HEAD back before the latest commit
self.coder.repo.repo.git.reset("--soft", "HEAD~1")
self.io.tool_output(
f"Commit `{last_commit_hash}` with message '{last_commit_message}' was reset and removed from git."
)
self.io.tool_output(f"Removed: {last_commit_hash} {last_commit_message}")
# 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}'."
)
self.io.tool_output(f"HEAD is: {current_head_hash} {current_head_message}")
if self.coder.main_model.send_undo_reply:
return prompts.undo_command_reply
@ -375,8 +371,8 @@ class Commands:
diff = self.coder.repo.diff_commits(
self.coder.pretty,
'HEAD^',
'HEAD',
"HEAD^",
"HEAD",
)
# don't use io.tool_output() because we don't want to log or further colorize