Refactor dirty_files to only include indexed changes.

This commit is contained in:
Paul Gauthier 2024-01-02 09:04:42 -08:00
parent 46b024b555
commit 34c4331110

View file

@ -187,8 +187,9 @@ class Commands:
return return
last_commit = self.coder.repo.repo.head.commit last_commit = self.coder.repo.repo.head.commit
dump(last_commit)
changed_files_last_commit = {item.a_path for item in last_commit.diff(None)} changed_files_last_commit = {item.a_path for item in last_commit.diff(None)}
dirty_files = self.coder.repo.repo.untracked_files + [item.a_path for item in self.coder.repo.repo.index.diff(None)] 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) dirty_files_in_last_commit = changed_files_last_commit.intersection(dirty_files)
dump(changed_files_last_commit) dump(changed_files_last_commit)
dump(dirty_files) dump(dirty_files)
@ -228,7 +229,7 @@ class Commands:
" command!" " command!"
) )
return return
# self.coder.repo.repo.git.reset("--hard", "HEAD~1") self.coder.repo.repo.git.reset("--hard", "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} "