dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-23 13:54:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Only /undo the files which were part of the last commit, don't stomp other dirty files #513

Browse source
This commit is contained in:
Paul Gauthier 2024-03-22 09:49:16 -07:00
parent 7103029abb
commit a39965a9ff
2 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
aider/commands.py
View file

@ -224,13 +224,11 @@ class Commands:
return return
last_commit = self.coder.repo.repo.head.commit last_commit = self.coder.repo.repo.head.commit
changed_files_last_commit = { changed_files_last_commit = [
item.a_path for item in last_commit.diff(last_commit.parents[0]) item.a_path for item in last_commit.diff(last_commit.parents[0])
} ]
dirty_files = [item.a_path for item in self.coder.repo.repo.index.diff(None)]
dirty_files_in_last_commit = changed_files_last_commit.intersection(dirty_files)
if dirty_files_in_last_commit: if any(self.coder.repo.repo.is_dirty(path=fname) for fname in changed_files_last_commit):
self.io.tool_error( self.io.tool_error(
"The repository has uncommitted changes in files that were modified in the last" "The repository has uncommitted changes in files that were modified in the last"
" commit. Please commit or stash them before undoing." " commit. Please commit or stash them before undoing."
@ -264,7 +262,13 @@ class Commands:
" command!" " command!"
) )
return return
self.coder.repo.repo.git.reset("--hard", "HEAD~1")
# Reset only the files which are part of `last_commit`
for file_path in changed_files_last_commit:
self.coder.repo.repo.git.checkout("HEAD~1", file_path)
# Move the HEAD back before the latest commit
self.coder.repo.repo.git.reset("--soft", "HEAD~1")
self.io.tool_output( self.io.tool_output(
f"{last_commit.message.strip()}\n" f"{last_commit.message.strip()}\n"
f"The above commit {self.coder.last_aider_commit_hash} " f"The above commit {self.coder.last_aider_commit_hash} "

3
tests/test_commands.py
View file

@ -539,6 +539,9 @@ class TestCommands(TestCase):
commands.cmd_undo("") commands.cmd_undo("")
self.assertNotEqual(last_commit_hash, repo.head.commit.hexsha[:7]) self.assertNotEqual(last_commit_hash, repo.head.commit.hexsha[:7])
self.assertEqual(file_path.read_text(), "first content")
self.assertEqual(other_path.read_text(), "dirty content")
del coder del coder
del commands del commands
del repo del repo