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

finished refactoring get_diffs

Browse source
This commit is contained in:
Paul Gauthier 2023-05-15 14:15:53 -07:00
parent 076003310e
commit 9ec43b4ee0
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
aider/coder.py
View file

@ -461,6 +461,16 @@ class Coder:
return commit_message return commit_message
def get_diffs(self, *final_args):
args = ["HEAD"]
if self.pretty:
args += ["--color"]
args += final_args
diffs = self.repo.git.diff(*args)
return diffs
def commit(self, history=None, prefix=None, ask=False, message=None, which="chat_files"): def commit(self, history=None, prefix=None, ask=False, message=None, which="chat_files"):
repo = self.repo repo = self.repo
if not repo: if not repo:
@ -469,14 +479,7 @@ class Coder:
if not repo.is_dirty(): if not repo.is_dirty():
return return
def get_diffs(self, relative_fname): def get_dirty_files_and_diffs(file_list):
if self.pretty:
these_diffs = self.repo.git.diff("HEAD", "--color", "--", relative_fname)
else:
these_diffs = self.repo.git.diff("HEAD", relative_fname)
return these_diffs
def get_dirty_files_and_diffs(self, file_list):
diffs = "" diffs = ""
relative_dirty_files = [] relative_dirty_files = []
for fname in file_list: for fname in file_list:
@ -484,14 +487,16 @@ class Coder:
relative_dirty_files.append(relative_fname) relative_dirty_files.append(relative_fname)
try: try:
current_branch_commit_count = len(list(self.repo.iter_commits(self.repo.active_branch))) current_branch_commit_count = len(
list(self.repo.iter_commits(self.repo.active_branch))
)
except git.exc.GitCommandError: except git.exc.GitCommandError:
current_branch_commit_count = None current_branch_commit_count = None
if not current_branch_commit_count: if not current_branch_commit_count:
continue continue
these_diffs = self.get_diffs(relative_fname) these_diffs = self.get_diffs("--", relative_fname)
if these_diffs: if these_diffs:
diffs += these_diffs + "\n" diffs += these_diffs + "\n"