import os import platform import tempfile import unittest from pathlib import Path from unittest.mock import patch import git from aider.dump import dump # noqa: F401 from aider.io import InputOutput from aider.models import Model from aider.repo import GitRepo from aider.utils import GitTemporaryDirectory class TestRepo(unittest.TestCase): def setUp(self): self.GPT35 = Model("gpt-3.5-turbo") def test_diffs_empty_repo(self): with GitTemporaryDirectory(): repo = git.Repo() # Add a change to the index fname = Path("foo.txt") fname.write_text("index\n") repo.git.add(str(fname)) # Make a change in the working dir fname.write_text("workingdir\n") git_repo = GitRepo(InputOutput(), None, ".") diffs = git_repo.get_diffs() self.assertIn("index", diffs) self.assertIn("workingdir", diffs) def test_diffs_nonempty_repo(self): with GitTemporaryDirectory(): repo = git.Repo() fname = Path("foo.txt") fname.touch() repo.git.add(str(fname)) fname2 = Path("bar.txt") fname2.touch() repo.git.add(str(fname2)) repo.git.commit("-m", "initial") fname.write_text("index\n") repo.git.add(str(fname)) fname2.write_text("workingdir\n") git_repo = GitRepo(InputOutput(), None, ".") diffs = git_repo.get_diffs() self.assertIn("index", diffs) self.assertIn("workingdir", diffs) def test_diffs_detached_head(self): with GitTemporaryDirectory(): repo = git.Repo() fname = Path("foo.txt") fname.touch() repo.git.add(str(fname)) repo.git.commit("-m", "foo") fname2 = Path("bar.txt") fname2.touch() repo.git.add(str(fname2)) repo.git.commit("-m", "bar") fname3 = Path("baz.txt") fname3.touch() repo.git.add(str(fname3)) repo.git.commit("-m", "baz") repo.git.checkout("HEAD^") fname.write_text("index\n") repo.git.add(str(fname)) fname2.write_text("workingdir\n") git_repo = GitRepo(InputOutput(), None, ".") diffs = git_repo.get_diffs() self.assertIn("index", diffs) self.assertIn("workingdir", diffs) def test_diffs_between_commits(self): with GitTemporaryDirectory(): repo = git.Repo() fname = Path("foo.txt") fname.write_text("one\n") repo.git.add(str(fname)) repo.git.commit("-m", "initial") fname.write_text("two\n") repo.git.add(str(fname)) repo.git.commit("-m", "second") git_repo = GitRepo(InputOutput(), None, ".") diffs = git_repo.diff_commits(False, "HEAD~1", "HEAD") self.assertIn("two", diffs) @patch("aider.repo.simple_send_with_retries") def test_get_commit_message(self, mock_send): mock_send.return_value = "a good commit message" repo = GitRepo(InputOutput(), None, None, models=[self.GPT35]) # Call the get_commit_message method with dummy diff and context result = repo.get_commit_message("dummy diff", "dummy context") # Assert that the returned message is the expected one self.assertEqual(result, "a good commit message") @patch("aider.repo.simple_send_with_retries") def test_get_commit_message_strip_quotes(self, mock_send): mock_send.return_value = '"a good commit message"' repo = GitRepo(InputOutput(), None, None, models=[self.GPT35]) # Call the get_commit_message method with dummy diff and context result = repo.get_commit_message("dummy diff", "dummy context") # Assert that the returned message is the expected one self.assertEqual(result, "a good commit message") @patch("aider.repo.simple_send_with_retries") def test_get_commit_message_no_strip_unmatched_quotes(self, mock_send): mock_send.return_value = 'a good "commit message"' repo = GitRepo(InputOutput(), None, None, models=[self.GPT35]) # Call the get_commit_message method with dummy diff and context result = repo.get_commit_message("dummy diff", "dummy context") # Assert that the returned message is the expected one self.assertEqual(result, 'a good "commit message"') @patch("aider.repo.GitRepo.get_commit_message") def test_commit_with_custom_committer_name(self, mock_send): mock_send.return_value = '"a good commit message"' # Cleanup of the git temp dir explodes on windows if platform.system() == "Windows": return with GitTemporaryDirectory(): # new repo raw_repo = git.Repo() raw_repo.config_writer().set_value("user", "name", "Test User").release() # add a file and commit it fname = Path("file.txt") fname.touch() raw_repo.git.add(str(fname)) raw_repo.git.commit("-m", "initial commit") io = InputOutput() git_repo = GitRepo(io, None, None) # commit a change fname.write_text("new content") git_repo.commit(fnames=[str(fname)], aider_edits=True) # check the committer name commit = raw_repo.head.commit self.assertEqual(commit.author.name, "Test User (aider)") self.assertEqual(commit.committer.name, "Test User (aider)") # commit a change without aider_edits fname.write_text("new content again!") git_repo.commit(fnames=[str(fname)], aider_edits=False) # check the committer name commit = raw_repo.head.commit self.assertEqual(commit.author.name, "Test User") self.assertEqual(commit.committer.name, "Test User (aider)") # check that the original committer name is restored original_committer_name = os.environ.get("GIT_COMMITTER_NAME") self.assertIsNone(original_committer_name) original_author_name = os.environ.get("GIT_AUTHOR_NAME") self.assertIsNone(original_author_name) def test_get_tracked_files(self): # Create a temporary directory tempdir = Path(tempfile.mkdtemp()) # Initialize a git repository in the temporary directory and set user name and email repo = git.Repo.init(tempdir) repo.config_writer().set_value("user", "name", "Test User").release() repo.config_writer().set_value("user", "email", "testuser@example.com").release() # Create three empty files and add them to the git repository filenames = ["README.md", "subdir/fänny.md", "systemüber/blick.md", 'file"with"quotes.txt'] created_files = [] for filename in filenames: file_path = tempdir / filename try: file_path.parent.mkdir(parents=True, exist_ok=True) file_path.touch() repo.git.add(str(file_path)) created_files.append(Path(filename)) except OSError: # windows won't allow files with quotes, that's ok self.assertIn('"', filename) self.assertEqual(os.name, "nt") self.assertTrue(len(created_files) >= 3) repo.git.commit("-m", "added") tracked_files = GitRepo(InputOutput(), [tempdir], None).get_tracked_files() # On windows, paths will come back \like\this, so normalize them back to Paths tracked_files = [Path(fn) for fn in tracked_files] # Assert that coder.get_tracked_files() returns the three filenames self.assertEqual(set(tracked_files), set(created_files)) def test_get_tracked_files_with_new_staged_file(self): with GitTemporaryDirectory(): # new repo raw_repo = git.Repo() # add it, but no commits at all in the raw_repo yet fname = Path("new.txt") fname.touch() raw_repo.git.add(str(fname)) git_repo = GitRepo(InputOutput(), None, None) # better be there fnames = git_repo.get_tracked_files() self.assertIn(str(fname), fnames) # commit it, better still be there raw_repo.git.commit("-m", "new") fnames = git_repo.get_tracked_files() self.assertIn(str(fname), fnames) # new file, added but not committed fname2 = Path("new2.txt") fname2.touch() raw_repo.git.add(str(fname2)) # both should be there fnames = git_repo.get_tracked_files() self.assertIn(str(fname), fnames) self.assertIn(str(fname2), fnames) def test_get_tracked_files_with_aiderignore(self): with GitTemporaryDirectory(): # new repo raw_repo = git.Repo() # add it, but no commits at all in the raw_repo yet fname = Path("new.txt") fname.touch() raw_repo.git.add(str(fname)) aiderignore = Path(".aiderignore") git_repo = GitRepo(InputOutput(), None, None, str(aiderignore)) # better be there fnames = git_repo.get_tracked_files() self.assertIn(str(fname), fnames) # commit it, better still be there raw_repo.git.commit("-m", "new") fnames = git_repo.get_tracked_files() self.assertIn(str(fname), fnames) # new file, added but not committed fname2 = Path("new2.txt") fname2.touch() raw_repo.git.add(str(fname2)) # both should be there fnames = git_repo.get_tracked_files() self.assertIn(str(fname), fnames) self.assertIn(str(fname2), fnames) aiderignore.write_text("new.txt\n") # new.txt should be gone! fnames = git_repo.get_tracked_files() self.assertNotIn(str(fname), fnames) self.assertIn(str(fname2), fnames) # This does not work in github actions?! # The mtime doesn't change, even if I time.sleep(1) # Before doing this write_text()!? # # aiderignore.write_text("new2.txt\n") # new2.txt should be gone! # fnames = git_repo.get_tracked_files() # self.assertIn(str(fname), fnames) # self.assertNotIn(str(fname2), fnames) def test_get_tracked_files_from_subdir(self): with GitTemporaryDirectory(): # new repo raw_repo = git.Repo() # add it, but no commits at all in the raw_repo yet fname = Path("subdir/new.txt") fname.parent.mkdir() fname.touch() raw_repo.git.add(str(fname)) os.chdir(fname.parent) git_repo = GitRepo(InputOutput(), None, None) # better be there fnames = git_repo.get_tracked_files() self.assertIn(str(fname), fnames) # commit it, better still be there raw_repo.git.commit("-m", "new") fnames = git_repo.get_tracked_files() self.assertIn(str(fname), fnames) @patch("aider.repo.simple_send_with_retries") def test_noop_commit(self, mock_send): mock_send.return_value = '"a good commit message"' with GitTemporaryDirectory(): # new repo raw_repo = git.Repo() # add it, but no commits at all in the raw_repo yet fname = Path("file.txt") fname.touch() raw_repo.git.add(str(fname)) raw_repo.git.commit("-m", "new") git_repo = GitRepo(InputOutput(), None, None) git_repo.commit(fnames=[str(fname)])