From 9ec43b4ee0a7b2204638f77c3fb8e0b4b0ef14c0 Mon Sep 17 00:00:00 2001
From: Paul Gauthier <aider@paulg.org>
Date: Mon, 15 May 2023 14:15:53 -0700
Subject: [PATCH] finished refactoring get_diffs

---
 aider/coder.py | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/aider/coder.py b/aider/coder.py
index 344163e41..f74799ac4 100755
--- a/aider/coder.py
+++ b/aider/coder.py
@@ -461,6 +461,16 @@ class Coder:
 
         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"):
         repo = self.repo
         if not repo:
@@ -469,14 +479,7 @@ class Coder:
         if not repo.is_dirty():
             return
 
-        def get_diffs(self, relative_fname):
-            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):
+        def get_dirty_files_and_diffs(file_list):
             diffs = ""
             relative_dirty_files = []
             for fname in file_list:
@@ -484,14 +487,16 @@ class Coder:
                 relative_dirty_files.append(relative_fname)
 
                 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:
                     current_branch_commit_count = None
 
                 if not current_branch_commit_count:
                     continue
 
-                these_diffs = self.get_diffs(relative_fname)
+                these_diffs = self.get_diffs("--", relative_fname)
 
                 if these_diffs:
                     diffs += these_diffs + "\n"