Refactor git_diff_context function to handle staged and unstaged files separately

Author: TechNickAI

aicodebot/helpers.py

@@ -18,9 +18,12 @@ def git_diff_context(commit=None):
     else:
         staged_files = exec_and_get_output(["git", "diff", "--cached", "--name-only"]).splitlines()
         if staged_files:
-            file_status = exec_and_get_output(["git", "diff", "--cached", "--name-status"]).splitlines()
+            # If there are staged files, get the diff for those files
+            diff_type = "--cached"
         else:
-            file_status = exec_and_get_output(["git", "diff", "--name-status"]).splitlines()
+            diff_type = "HEAD"
+
+        file_status = exec_and_get_output(["git", "diff", diff_type, "--name-status"]).splitlines()
 
         diffs = []
         for status in file_status:
@@ -33,7 +36,7 @@ def git_diff_context(commit=None):
             else:
                 # If the file is not new, get the diff
                 diffs.append(f"## File changed: {file_name}")
-                diffs.append(exec_and_get_output(base_git_diff + ["--cached", "--", file_name]))
+                diffs.append(exec_and_get_output(base_git_diff + [diff_type, "--", file_name]))
 
         return "\n".join(diffs)
 

tests/test_helpers.py

@@ -24,9 +24,14 @@ def test_git_diff_context(cli_runner, temp_git_repo):
         diff = git_diff_context()
         assert "Adding a new line." in diff
 
-        # Commit the changes
         repo = Repo(temp_git_repo.working_dir)
+
+        # Stage the changes
         repo.git.add("test.txt")
+        diff = git_diff_context()
+        assert "Adding a new line." in diff
+
+        # Commit the changes
         repo.git.commit("-m", "Add test.txt")
 
         # Get the diff for the commit