dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-23 13:54:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

feat: Explicit author/committer flags override co-authored-by

Browse source 
Co-authored-by: aider (vertex_ai/gemini-2.5-pro-exp-03-25) <noreply@aider.dev>
This commit is contained in:
Andrew Grigorev 2025-04-12 19:09:46 +03:00
parent dd4b61da20
commit ea74f31b3e
3 changed files with 77 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

13
aider/args.py
View file

@ -427,17 +427,20 @@ def get_parser(default_config_files, git_root):
group.add_argument( group.add_argument(
"--attribute-author", "--attribute-author",
action=argparse.BooleanOptionalAction, action=argparse.BooleanOptionalAction,
default=True, default=None,
help=( help=(
"Attribute aider code changes in the git author name (default: True). This is ignored" "Attribute aider code changes in the git author name (default: True). If explicitly set"
" if --attribute-co-authored-by is True." " to True, overrides --attribute-co-authored-by precedence."
), ),
) )
group.add_argument( group.add_argument(
"--attribute-committer", "--attribute-committer",
action=argparse.BooleanOptionalAction, action=argparse.BooleanOptionalAction,
default=True, default=None,
help="Attribute aider commits in the git committer name (default: True)", help=(
"Attribute aider commits in the git committer name (default: True). If explicitly set"
" to True, overrides --attribute-co-authored-by precedence for aider edits."
),
) )
group.add_argument( group.add_argument(
"--attribute-commit-message-author", "--attribute-commit-message-author",

28
aider/repo.py
View file

@ -153,7 +153,16 @@ class GitRepo:
attribute_committer = self.attribute_committer attribute_committer = self.attribute_committer
attribute_commit_message_author = self.attribute_commit_message_author attribute_commit_message_author = self.attribute_commit_message_author
attribute_commit_message_committer = self.attribute_commit_message_committer attribute_commit_message_committer = self.attribute_commit_message_committer
attribute_co_authored_by = getattr(self, "attribute_co_authored_by", False) attribute_co_authored_by = getattr(self, "attribute_co_authored_by", False) # Should be False if not set
# Determine explicit settings (None means use default behavior)
author_explicit = attribute_author is not None
committer_explicit = attribute_committer is not None
# Determine effective settings (apply default True if not explicit)
effective_author = True if attribute_author is None else attribute_author
effective_committer = True if attribute_committer is None else attribute_committer
# Determine commit message prefixing # Determine commit message prefixing
prefix_commit_message = aider_edits and ( prefix_commit_message = aider_edits and (
@ -171,12 +180,21 @@ class GitRepo:
) )
# Determine if author/committer names should be modified # Determine if author/committer names should be modified
# If co-authored-by is used for aider edits, it takes precedence over direct name modification. # Author modification applies only to aider edits.
use_attribute_author = attribute_author and aider_edits and not attribute_co_authored_by # It's used if effective_author is True AND (co-authored-by is False OR author was explicitly set).
use_attribute_committer = attribute_committer and not ( use_attribute_author = (
aider_edits and attribute_co_authored_by aider_edits
and effective_author
and (not attribute_co_authored_by or author_explicit)
) )
# Committer modification applies regardless of aider_edits (based on tests).
# It's used if effective_committer is True AND (it's not an aider edit with co-authored-by OR committer was explicitly set).
use_attribute_committer = effective_committer and (
not (aider_edits and attribute_co_authored_by) or committer_explicit
)
if not commit_message: if not commit_message:
commit_message = "(no commit message provided)" commit_message = "(no commit message provided)"

87
tests/basic/test_repo.py
View file

@ -185,26 +185,35 @@ class TestRepo(unittest.TestCase):
raw_repo.git.commit("-m", "initial commit") raw_repo.git.commit("-m", "initial commit")
io = InputOutput() io = InputOutput()
git_repo = GitRepo(io, None, None) # Initialize GitRepo with default None values for attributes
git_repo = GitRepo(io, None, None, attribute_author=None, attribute_committer=None)
# commit a change # commit a change with aider_edits=True (using default attributes)
fname.write_text("new content") fname.write_text("new content")
git_repo.commit(fnames=[str(fname)], aider_edits=True) git_repo.commit(fnames=[str(fname)], aider_edits=True)
# check the committer name # check the committer name (defaults interpreted as True)
commit = raw_repo.head.commit commit = raw_repo.head.commit
self.assertEqual(commit.author.name, "Test User (aider)") self.assertEqual(commit.author.name, "Test User (aider)")
self.assertEqual(commit.committer.name, "Test User (aider)") self.assertEqual(commit.committer.name, "Test User (aider)")
# commit a change without aider_edits # commit a change without aider_edits (using default attributes)
fname.write_text("new content again!") fname.write_text("new content again!")
git_repo.commit(fnames=[str(fname)], aider_edits=False) git_repo.commit(fnames=[str(fname)], aider_edits=False)
# check the committer name # check the committer name (author not modified, committer still modified by default)
commit = raw_repo.head.commit commit = raw_repo.head.commit
self.assertEqual(commit.author.name, "Test User") self.assertEqual(commit.author.name, "Test User")
self.assertEqual(commit.committer.name, "Test User (aider)") self.assertEqual(commit.committer.name, "Test User (aider)")
# Now test with explicit False
git_repo_explicit_false = GitRepo(io, None, None, attribute_author=False, attribute_committer=False)
fname.write_text("explicit false content")
git_repo_explicit_false.commit(fnames=[str(fname)], aider_edits=True)
commit = raw_repo.head.commit
self.assertEqual(commit.author.name, "Test User") # Explicit False
self.assertEqual(commit.committer.name, "Test User") # Explicit False
# check that the original committer name is restored # check that the original committer name is restored
original_committer_name = os.environ.get("GIT_COMMITTER_NAME") original_committer_name = os.environ.get("GIT_COMMITTER_NAME")
self.assertIsNone(original_committer_name) self.assertIsNone(original_committer_name)
@ -228,15 +237,13 @@ class TestRepo(unittest.TestCase):
raw_repo.git.add(str(fname)) raw_repo.git.add(str(fname))
raw_repo.git.commit("-m", "initial commit") raw_repo.git.commit("-m", "initial commit")
# Mock coder args # Mock coder args: Co-authored-by enabled, author/committer use default (None)
# Mock coder args: Co-authored-by enabled, author/committer modification disabled
mock_coder = MagicMock() mock_coder = MagicMock()
mock_coder.args.attribute_co_authored_by = True mock_coder.args.attribute_co_authored_by = True
mock_coder.args.attribute_author = False # Explicitly disable name modification mock_coder.args.attribute_author = None # Default
mock_coder.args.attribute_committer = False # Explicitly disable name modification mock_coder.args.attribute_committer = None # Default
mock_coder.args.attribute_commit_message_author = False mock_coder.args.attribute_commit_message_author = False
mock_coder.args.attribute_commit_message_committer = False mock_coder.args.attribute_commit_message_committer = False
# Set the model name correctly on the nested mock
# The code uses coder.main_model.name for the co-authored-by line # The code uses coder.main_model.name for the co-authored-by line
mock_coder.main_model = MagicMock() mock_coder.main_model = MagicMock()
mock_coder.main_model.name = "gpt-test" mock_coder.main_model.name = "gpt-test"
@ -253,16 +260,17 @@ class TestRepo(unittest.TestCase):
commit = raw_repo.head.commit commit = raw_repo.head.commit
self.assertIn("Co-authored-by: aider (gpt-test) <noreply@aider.dev>", commit.message) self.assertIn("Co-authored-by: aider (gpt-test) <noreply@aider.dev>", commit.message)
self.assertEqual(commit.message.splitlines()[0], "Aider edit") self.assertEqual(commit.message.splitlines()[0], "Aider edit")
# With default (None), co-authored-by takes precedence
self.assertEqual(commit.author.name, "Test User") # Should NOT be modified self.assertEqual(commit.author.name, "Test User") # Should NOT be modified
self.assertEqual(commit.committer.name, "Test User") # Should NOT be modified self.assertEqual(commit.committer.name, "Test User") # Should NOT be modified
def test_commit_with_co_authored_by_and_name_modification(self): def test_commit_co_authored_by_with_explicit_name_modification(self):
# Test scenario where Co-authored-by is true AND author/committer modification is also true (default) # Test scenario where Co-authored-by is true AND author/committer modification are explicitly True
# Cleanup of the git temp dir explodes on windows
if platform.system() == "Windows": if platform.system() == "Windows":
return return
with GitTemporaryDirectory(): with GitTemporaryDirectory():
# Setup repo...
# new repo # new repo
raw_repo = git.Repo() raw_repo = git.Repo()
raw_repo.config_writer().set_value("user", "name", "Test User").release() raw_repo.config_writer().set_value("user", "name", "Test User").release()
@ -274,14 +282,13 @@ class TestRepo(unittest.TestCase):
raw_repo.git.add(str(fname)) raw_repo.git.add(str(fname))
raw_repo.git.commit("-m", "initial commit") raw_repo.git.commit("-m", "initial commit")
# Mock coder args: Co-authored-by enabled, author/committer modification enabled (default) # Mock coder args: Co-authored-by enabled, author/committer modification explicitly enabled
mock_coder = MagicMock() mock_coder = MagicMock()
mock_coder.args.attribute_co_authored_by = True mock_coder.args.attribute_co_authored_by = True
mock_coder.args.attribute_author = True # Explicitly enable (or rely on default) mock_coder.args.attribute_author = True # Explicitly enable
mock_coder.args.attribute_committer = True # Explicitly enable (or rely on default) mock_coder.args.attribute_committer = True # Explicitly enable
mock_coder.args.attribute_commit_message_author = False mock_coder.args.attribute_commit_message_author = False
mock_coder.args.attribute_commit_message_committer = False mock_coder.args.attribute_commit_message_committer = False
# Set the model name correctly on the nested mock
mock_coder.main_model = MagicMock() mock_coder.main_model = MagicMock()
mock_coder.main_model.name = "gpt-test-combo" mock_coder.main_model.name = "gpt-test-combo"
@ -297,12 +304,12 @@ class TestRepo(unittest.TestCase):
commit = raw_repo.head.commit commit = raw_repo.head.commit
self.assertIn("Co-authored-by: aider (gpt-test-combo) <noreply@aider.dev>", commit.message) self.assertIn("Co-authored-by: aider (gpt-test-combo) <noreply@aider.dev>", commit.message)
self.assertEqual(commit.message.splitlines()[0], "Aider combo edit") self.assertEqual(commit.message.splitlines()[0], "Aider combo edit")
# When co-authored-by is true, name modification should be disabled # When co-authored-by is true BUT author/committer are explicit True, modification SHOULD happen
self.assertEqual(commit.author.name, "Test User") # Should NOT be modified self.assertEqual(commit.author.name, "Test User (aider)") # Should be modified
self.assertEqual(commit.committer.name, "Test User") # Should NOT be modified self.assertEqual(commit.committer.name, "Test User (aider)") # Should be modified
def test_commit_co_authored_by_precedence(self): def test_commit_co_authored_by_precedence_over_default(self):
# Test that co-authored-by takes precedence over name modification when both are enabled # Test that co-authored-by takes precedence over default (None) name modification
if platform.system() == "Windows": if platform.system() == "Windows":
return return
@ -318,30 +325,29 @@ class TestRepo(unittest.TestCase):
raw_repo.git.add(str(fname)) raw_repo.git.add(str(fname))
raw_repo.git.commit("-m", "initial commit") raw_repo.git.commit("-m", "initial commit")
# Mock coder args: All relevant flags enabled # Mock coder args: Co-authored-by enabled, author/committer use default (None)
mock_coder = MagicMock() mock_coder = MagicMock()
mock_coder.args.attribute_co_authored_by = True mock_coder.args.attribute_co_authored_by = True
mock_coder.args.attribute_author = True # Explicitly enable (or rely on default) mock_coder.args.attribute_author = None # Default
mock_coder.args.attribute_committer = True # Explicitly enable (or rely on default) mock_coder.args.attribute_committer = None # Default
mock_coder.args.attribute_commit_message_author = False mock_coder.args.attribute_commit_message_author = False
mock_coder.args.attribute_commit_message_committer = False mock_coder.args.attribute_commit_message_committer = False
mock_coder.main_model = MagicMock() mock_coder.main_model = MagicMock() # Define main_model before accessing name
mock_coder.main_model.name = "gpt-precedence" mock_coder.main_model.name = "gpt-precedence"
io = InputOutput() io = InputOutput()
# Initialize GitRepo directly with flags, simulating config/defaults if coder wasn't passed # Initialize GitRepo directly with flags, simulating config/defaults
# This ensures the test covers the case where coder might not provide args # Use None for author/committer to test default behavior
git_repo = GitRepo( git_repo = GitRepo(
io, io,
None, None,
None, None,
attribute_co_authored_by=True, attribute_co_authored_by=True,
attribute_author=True, attribute_author=None, # Default
attribute_committer=True, attribute_committer=None, # Default
) )
# commit a change with aider_edits=True and default flags
# commit a change with aider_edits=True and conflicting flags
fname.write_text("new content precedence") fname.write_text("new content precedence")
# Pass the coder object here to ensure its args are used if available, # Pass the coder object here to ensure its args are used if available,
# but the GitRepo init already set the fallback values. # but the GitRepo init already set the fallback values.
@ -351,13 +357,13 @@ class TestRepo(unittest.TestCase):
commit = raw_repo.head.commit commit = raw_repo.head.commit
self.assertIn("Co-authored-by: aider (gpt-precedence) <noreply@aider.dev>", commit.message) self.assertIn("Co-authored-by: aider (gpt-precedence) <noreply@aider.dev>", commit.message)
self.assertEqual(commit.message.splitlines()[0], "Aider precedence edit") self.assertEqual(commit.message.splitlines()[0], "Aider precedence edit")
# Co-authored-by should take precedence, names should NOT be modified # Co-authored-by should take precedence over default (None), names should NOT be modified
self.assertEqual(commit.author.name, "Test User") self.assertEqual(commit.author.name, "Test User")
self.assertEqual(commit.committer.name, "Test User") self.assertEqual(commit.committer.name, "Test User")
def test_commit_without_co_authored_by(self): def test_commit_without_co_authored_by(self):
# Cleanup of the git temp dir explodes on windows # Test standard name modification when co-authored-by is False
if platform.system() == "Windows": if platform.system() == "Windows":
return return
@ -373,14 +379,13 @@ class TestRepo(unittest.TestCase):
raw_repo.git.add(str(fname)) raw_repo.git.add(str(fname))
raw_repo.git.commit("-m", "initial commit") raw_repo.git.commit("-m", "initial commit")
# Mock coder args (default behavior) # Mock coder args (co-authored-by False, author/committer default None)
mock_coder = MagicMock() mock_coder = MagicMock()
mock_coder.args.attribute_co_authored_by = False mock_coder.args.attribute_co_authored_by = False
mock_coder.args.attribute_author = True mock_coder.args.attribute_author = None # Default
mock_coder.args.attribute_committer = True mock_coder.args.attribute_committer = None # Default
mock_coder.args.attribute_commit_message_author = False mock_coder.args.attribute_commit_message_author = False
mock_coder.args.attribute_commit_message_committer = False mock_coder.args.attribute_commit_message_committer = False
# Set the model name correctly on the nested mock (though not used in this test assertion)
mock_coder.main_model = MagicMock() mock_coder.main_model = MagicMock()
mock_coder.main_model.name = "gpt-test-no-coauthor" mock_coder.main_model.name = "gpt-test-no-coauthor"
@ -392,12 +397,12 @@ class TestRepo(unittest.TestCase):
fname.write_text("new content") fname.write_text("new content")
git_repo.commit(fnames=[str(fname)], aider_edits=True, coder=mock_coder, message="Aider edit") git_repo.commit(fnames=[str(fname)], aider_edits=True, coder=mock_coder, message="Aider edit")
# check the commit message and author/committer # check the commit message and author/committer (defaults interpreted as True)
commit = raw_repo.head.commit commit = raw_repo.head.commit
self.assertNotIn("Co-authored-by:", commit.message) self.assertNotIn("Co-authored-by:", commit.message)
self.assertEqual(commit.message.splitlines()[0], "Aider edit") self.assertEqual(commit.message.splitlines()[0], "Aider edit")
self.assertEqual(commit.author.name, "Test User (aider)") # Should be modified self.assertEqual(commit.author.name, "Test User (aider)") # Should be modified (default True)
self.assertEqual(commit.committer.name, "Test User (aider)") # Should be modified self.assertEqual(commit.committer.name, "Test User (aider)") # Should be modified (default True)
def test_get_tracked_files(self): def test_get_tracked_files(self):