Merge pull request #3609 from omarcinkonis/main

aider/args.py

@@ -410,6 +410,12 @@ def get_parser(default_config_files, git_root):
         default=True,
         help="Enable/disable adding .aider* to .gitignore (default: True)",
     )
+    group.add_argument(
+        "--add-gitignore-files",
+        action=argparse.BooleanOptionalAction,
+        default=False,
+        help="Enable/disable the addition of files listed in .gitignore to Aider's editing scope.",
+    )
     default_aiderignore_file = (
         os.path.join(git_root, ".aiderignore") if git_root else ".aiderignore"
     )

aider/coders/base_coder.py

@@ -302,6 +302,7 @@ class Coder:
         io,
         repo=None,
         fnames=None,
+        add_gitignore_files=False,
         read_only_fnames=None,
         show_diffs=False,
         auto_commits=True,
@@ -389,6 +390,7 @@ class Coder:
         self.verbose = verbose
         self.abs_fnames = set()
         self.abs_read_only_fnames = set()
+        self.add_gitignore_files = add_gitignore_files
 
         if cur_messages:
             self.cur_messages = cur_messages
@@ -446,7 +448,7 @@ class Coder:
 
         for fname in fnames:
             fname = Path(fname)
-            if self.repo and self.repo.git_ignored_file(fname):
+            if self.repo and self.repo.git_ignored_file(fname) and not self.add_gitignore_files:
                 self.io.tool_warning(f"Skipping {fname} that matches gitignore spec.")
                 continue
 

aider/commands.py

@@ -844,7 +844,11 @@ class Commands:
                 )
                 continue
 
-            if self.coder.repo and self.coder.repo.git_ignored_file(matched_file):
+            if (
+                self.coder.repo
+                and self.coder.repo.git_ignored_file(matched_file)
+                and not self.coder.add_gitignore_files
+            ):
                 self.io.tool_error(f"Can't add {matched_file} which is in gitignore")
                 continue
 

aider/main.py

@@ -997,6 +997,7 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
             detect_urls=args.detect_urls,
             auto_copy_context=args.copy_paste,
             auto_accept_architect=args.auto_accept_architect,
+            add_gitignore_files=args.add_gitignore_files,
         )
     except UnknownEditFormat as err:
         io.tool_error(str(err))

aider/website/docs/config/options.md

@@ -388,6 +388,11 @@ Aliases:
   - `--gitignore`
   - `--no-gitignore`
 
+### `--add-gitignore-files`
+Enable/disable the addition of files listed in .gitignore to Aider's editing scope.
+Default: False
+Environment variable: `AIDER_ADD_GITIGNORE_FILES`
+
 ### `--aiderignore AIDERIGNORE`
 Specify the aider ignore file (default: .aiderignore in git root)  
 Default: .aiderignore  

tests/basic/test_main.py

@@ -152,6 +152,120 @@ class TestMain(TestCase):
             self.assertEqual("one\ntwo\n.aider*\n.env\n", gitignore.read_text())
             del os.environ["GIT_CONFIG_GLOBAL"]
 
+    def test_command_line_gitignore_files_flag(self):
+        with GitTemporaryDirectory() as git_dir:
+            git_dir = Path(git_dir)
+
+            # Create a .gitignore file
+            gitignore_file = git_dir / ".gitignore"
+            gitignore_file.write_text("ignored.txt\n")
+
+            # Create an ignored file
+            ignored_file = git_dir / "ignored.txt"
+            ignored_file.write_text("This file should be ignored.")
+            
+            # Get the absolute path to the ignored file
+            abs_ignored_file = str(ignored_file.resolve())
+
+            # Test without the --add-gitignore-files flag (default: False)
+            with patch("sys.stdout", new_callable=StringIO) as mock_stdout:
+                coder = main(
+                    ["--exit", "--yes", abs_ignored_file],
+                    input=DummyInput(),
+                    output=DummyOutput(),
+                    return_coder=True,
+                    force_git_root=git_dir,
+                )
+                # Verify the ignored file is not in the chat
+                self.assertNotIn(abs_ignored_file, coder.abs_fnames)
+
+            # Test with --add-gitignore-files set to True
+            with patch("sys.stdout", new_callable=StringIO) as mock_stdout:
+                coder = main(
+                    ["--add-gitignore-files", "--exit", "--yes", abs_ignored_file],
+                    input=DummyInput(),
+                    output=DummyOutput(),
+                    return_coder=True,
+                    force_git_root=git_dir,
+                )
+                # Verify the ignored file is in the chat
+                self.assertIn(abs_ignored_file, coder.abs_fnames)
+
+            # Test with --add-gitignore-files set to False
+            with patch("sys.stdout", new_callable=StringIO) as mock_stdout:
+                coder = main(
+                    ["--no-add-gitignore-files", "--exit", "--yes", abs_ignored_file],
+                    input=DummyInput(),
+                    output=DummyOutput(),
+                    return_coder=True,
+                    force_git_root=git_dir,
+                )
+                # Verify the ignored file is not in the chat
+                self.assertNotIn(abs_ignored_file, coder.abs_fnames)
+                
+    def test_add_command_gitignore_files_flag(self):
+        with GitTemporaryDirectory() as git_dir:
+            git_dir = Path(git_dir)
+
+            # Create a .gitignore file
+            gitignore_file = git_dir / ".gitignore"
+            gitignore_file.write_text("ignored.txt\n")
+
+            # Create an ignored file
+            ignored_file = git_dir / "ignored.txt"
+            ignored_file.write_text("This file should be ignored.")
+            
+            # Get the absolute path to the ignored file
+            abs_ignored_file = str(ignored_file.resolve())
+            rel_ignored_file = "ignored.txt"
+
+            # Test without the --add-gitignore-files flag (default: False)
+            with patch("sys.stdout", new_callable=StringIO) as mock_stdout:
+                coder = main(
+                    ["--exit", "--yes"],
+                    input=DummyInput(),
+                    output=DummyOutput(),
+                    return_coder=True,
+                    force_git_root=git_dir,
+                )
+                
+                with patch.object(coder.io, "confirm_ask", return_value=True):
+                    coder.commands.cmd_add(rel_ignored_file)
+
+                # Verify the ignored file is not in the chat
+                self.assertNotIn(abs_ignored_file, coder.abs_fnames)
+
+            # Test with --add-gitignore-files set to True
+            with patch("sys.stdout", new_callable=StringIO) as mock_stdout:
+                coder = main(
+                    ["--add-gitignore-files", "--exit", "--yes"],
+                    input=DummyInput(),
+                    output=DummyOutput(),
+                    return_coder=True,
+                    force_git_root=git_dir,
+                )
+                with patch.object(coder.io, "confirm_ask", return_value=True):
+                    coder.commands.cmd_add(rel_ignored_file)
+
+                # Verify the ignored file is in the chat
+                self.assertIn(abs_ignored_file, coder.abs_fnames)
+
+            # Test with --add-gitignore-files set to False
+            with patch("sys.stdout", new_callable=StringIO) as mock_stdout:
+                coder = main(
+                    ["--no-add-gitignore-files", "--exit", "--yes"],
+                    input=DummyInput(),
+                    output=DummyOutput(),
+                    return_coder=True,
+                    force_git_root=git_dir,
+                )
+
+                with patch.object(coder.io, "confirm_ask", return_value=True):
+                    coder.commands.cmd_add(rel_ignored_file)
+
+                # Verify the ignored file is not in the chat
+                self.assertNotIn(abs_ignored_file, coder.abs_fnames)
+
     def test_main_args(self):
         with patch("aider.coders.Coder.create") as MockCoder:
             # --yes will just ok the git repo without blocking on input