ran pre-commit to fix formatting

removed un-used import in git.py, navigator_coder.py

Author: tomjuggler

aider/coders/navigator_coder.py

@@ -56,6 +56,16 @@
 from aider.tools.delete_line import _execute_delete_line
 from aider.tools.delete_lines import _execute_delete_lines
 from aider.tools.extract_lines import _execute_extract_lines
+from aider.tools.git import (
+    _execute_git_diff,
+    _execute_git_log,
+    _execute_git_show,
+    _execute_git_status,
+    git_diff_schema,
+    git_log_schema,
+    git_show_schema,
+    git_status_schema,
+)
 from aider.tools.grep import _execute_grep
 from aider.tools.indent_lines import _execute_indent_lines
 from aider.tools.insert_block import _execute_insert_block
@@ -75,20 +85,7 @@
 
 # Import tool functions
 from aider.tools.view_files_matching import execute_view_files_matching
-from aider.tools.view_files_with_symbol import (
-    _execute_view_files_with_symbol,
-    view_files_with_symbol_schema,
-)
-from aider.tools.git import (
-    _execute_git_diff,
-    _execute_git_log,
-    _execute_git_show,
-    _execute_git_status,
-    git_diff_schema,
-    git_log_schema,
-    git_show_schema,
-    git_status_schema,
-)
+from aider.tools.view_files_with_symbol import _execute_view_files_with_symbol
 
 from .base_coder import ChatChunks, Coder
 from .editblock_coder import do_replace, find_original_update_blocks, find_similar_lines

aider/tools/__init__.py

@@ -10,6 +10,16 @@
 from .delete_line import _execute_delete_line, delete_line_schema
 from .delete_lines import _execute_delete_lines, delete_lines_schema
 from .extract_lines import _execute_extract_lines, extract_lines_schema
+from .git import (
+    _execute_git_diff,
+    _execute_git_log,
+    _execute_git_show,
+    _execute_git_status,
+    git_diff_schema,
+    git_log_schema,
+    git_show_schema,
+    git_status_schema,
+)
 from .grep import _execute_grep, grep_schema
 from .indent_lines import _execute_indent_lines, indent_lines_schema
 from .insert_block import _execute_insert_block, insert_block_schema
@@ -35,13 +45,3 @@
     _execute_view_files_with_symbol,
     view_files_with_symbol_schema,
 )
-from .git import (
-    _execute_git_diff,
-    _execute_git_log,
-    _execute_git_show,
-    _execute_git_status,
-    git_diff_schema,
-    git_log_schema,
-    git_show_schema,
-    git_status_schema,
-)

aider/tools/git.py

@@ -1,13 +1,12 @@
-# aider/tools/git.py
-
-import traceback
 from aider.repo import ANY_GIT_ERROR
 
 git_diff_schema = {
     "type": "function",
     "function": {
         "name": "git_diff",
-        "description": "Show the diff between the current working directory and a git branch or commit.",
+        "description": (
+            "Show the diff between the current working directory and a git branch or commit."
+        ),
         "parameters": {
             "type": "object",
             "properties": {
@@ -21,6 +20,7 @@
     },
 }
 
+
 def _execute_git_diff(coder, branch=None):
     """
     Show the diff between the current working directory and a git branch or commit.
@@ -41,6 +41,7 @@ def _execute_git_diff(coder, branch=None):
         coder.io.tool_error(f"Error running git diff: {e}")
         return f"Error running git diff: {e}"
 
+
 git_log_schema = {
     "type": "function",
     "function": {
@@ -59,6 +60,7 @@ def _execute_git_diff(coder, branch=None):
     },
 }
 
+
 def _execute_git_log(coder, limit=10):
     """
     Show the git log.
@@ -71,13 +73,14 @@ def _execute_git_log(coder, limit=10):
         log_output = []
         for commit in commits:
             short_hash = commit.hexsha[:8]
-            message = commit.message.strip().split('\n')[0]
+            message = commit.message.strip().split("\n")[0]
             log_output.append(f"{short_hash} {message}")
         return "\n".join(log_output)
     except ANY_GIT_ERROR as e:
         coder.io.tool_error(f"Error running git log: {e}")
         return f"Error running git log: {e}"
 
+
 git_show_schema = {
     "type": "function",
     "function": {
@@ -96,6 +99,7 @@ def _execute_git_log(coder, limit=10):
     },
 }
 
+
 def _execute_git_show(coder, object="HEAD"):
     """
     Show various types of objects (blobs, trees, tags, and commits).
@@ -109,6 +113,7 @@ def _execute_git_show(coder, object="HEAD"):
         coder.io.tool_error(f"Error running git show: {e}")
         return f"Error running git show: {e}"
 
+
 git_status_schema = {
     "type": "function",
     "function": {
@@ -122,6 +127,7 @@ def _execute_git_show(coder, object="HEAD"):
     },
 }
 
+
 def _execute_git_status(coder):
     """
     Show the working tree status.