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

Refactored the cmd_undo method to handle dirty files not in the last commit.

Browse source
This commit is contained in:
Paul Gauthier 2024-01-02 09:04:57 -08:00
parent 695299be3d
commit e09a2033e2
2 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

31
tests/test_commands.py
View file

@ -492,6 +492,7 @@ class TestCommands(TestCase):
commands.cmd_drop(str(fname))
self.assertEqual(len(coder.abs_fnames), 0)
def test_cmd_undo_with_dirty_files_not_in_last_commit(self):
with GitTemporaryDirectory() as repo_dir:
repo = git.Repo(repo_dir)
@ -499,34 +500,36 @@ class TestCommands(TestCase):
coder = Coder.create(models.GPT35, None, io)
commands = Commands(io, coder)
other_path = Path(repo_dir) / "other_file.txt"
other_path.write_text("other content")
repo.git.add(str(other_path))
# Create and commit a file
filename = "test_file.txt"
file_path = Path(repo_dir) / filename
file_path.write_text("Initial content")
file_path.write_text("first content")
repo.git.add(filename)
repo.git.commit("-m", "Initial commit")
repo.git.commit("-m", "aider: first commit")
# Modify the file and commit again
file_path.write_text("Modified content")
file_path.write_text("second content")
repo.git.add(filename)
repo.git.commit("-m", "aider: Modify test_file.txt")
repo.git.commit("-m", "aider: second commit")
# Store the commit hash
last_commit_hash = repo.head.commit.hexsha[:7]
coder.last_aider_commit_hash = last_commit_hash
# Create a dirty file that was not in the last commit
other_file = "other_file.txt"
other_file_path = Path(repo_dir) / other_file
other_file_path.write_text("This is an untracked file")
file_path.write_text("dirty content")
# Attempt to undo the last commit
output = commands.cmd_undo("")
self.assertIsNone(output, "Undo should not produce any output")
commands.cmd_undo("")
# Check that the last commit is still present
self.assertEqual(last_commit_hash, repo.head.commit.hexsha[:7])
# Check that the dirty file is still untracked
self.assertTrue(other_file_path.exists())
self.assertIn(other_file, repo.untracked_files)
# Put back the initial content (so it's not dirty now)
file_path.write_text("second content")
other_path.write_text("dirty content")
commands.cmd_undo("")
self.assertNotEqual(last_commit_hash, repo.head.commit.hexsha[:7])