feat: add ignore_bump_sha_list and ignore_bump_author_list to find_increment

Author: namwoam

commitizen/bump.py

@@ -23,7 +23,11 @@
 
 
 def find_increment(
-    commits: list[GitCommit], regex: str, increments_map: dict | OrderedDict
+    commits: list[GitCommit],
+    regex: str,
+    increments_map: dict | OrderedDict,
+    ignore_bump_sha_list: list[str] | None = None,
+    ignore_bump_author_list: list[str] | None = None,
 ) -> Increment | None:
     if isinstance(increments_map, dict):
         increments_map = OrderedDict(increments_map)
@@ -34,6 +38,18 @@ def find_increment(
     increment: str | None = None
 
     for commit in commits:
+        if ignore_bump_sha_list and commit.rev in ignore_bump_sha_list:
+            logger.debug(
+                f"Skipping commit {commit.rev} as it's in ignore_bump_sha_list"
+            )
+            continue
+
+        if ignore_bump_author_list and commit.author in ignore_bump_author_list:
+            logger.debug(
+                f"Skipping commit {commit.rev} as its author '{commit.author}' is in ignore_bump_author_list"
+            )
+            continue
+
         for message in commit.message.split("\n"):
             result = select_pattern.search(message)
 

commitizen/commands/bump.py

@@ -158,7 +158,11 @@ def _find_increment(self, commits: list[git.GitCommit]) -> Increment | None:
             raise NoPatternMapError(
                 f"'{self.config.settings['name']}' rule does not support bump"
             )
-        return bump.find_increment(commits, regex=bump_pattern, increments_map=bump_map)
+        return bump.find_increment(
+            commits,
+            regex=bump_pattern,
+            increments_map=bump_map,
+        )
 
     def _validate_arguments(self, current_version: VersionProtocol) -> None:
         errors: list[str] = []
@@ -363,6 +367,9 @@ def __call__(self) -> None:
                 new_tag_version=new_tag_version,
                 message=message,
                 increment=increment,
+                changelog_file_name=(
+                    changelog_cmd.file_name if self.changelog_flag else None
+                ),
                 changelog_file_name=changelog_file_name,
             )
 
@@ -426,7 +433,9 @@ def __call__(self) -> None:
                 current_tag_version=new_tag_version,
                 message=message,
                 increment=increment,
-                changelog_file_name=changelog_file_name,
+                changelog_file_name=(
+                    changelog_cmd.file_name if self.changelog_flag else None
+                ),
             )
 
         # TODO: For v3 output this only as diagnostic and remove this if

tests/test_bump_find_increment.py

@@ -108,6 +108,42 @@ def test_find_increment(messages, expected_type):
     assert increment_type == expected_type
 
 
+def test_find_increment_with_ignored_sha():
+    messages = [
+        "docs(README): motivation",
+        "BREAKING CHANGE: your upstream dependency have some breaking changes",
+    ]
+    commits = [
+        GitCommit(rev="test1", title=messages[0]),
+        GitCommit(rev="test2", title=messages[1]),
+    ]
+    increment_type = bump.find_increment(
+        commits,
+        regex=ConventionalCommitsCz.bump_pattern,
+        increments_map=ConventionalCommitsCz.bump_map,
+        ignore_bump_sha_list=["test2"],
+    )
+    assert increment_type is None
+
+
+def test_find_increment_with_ignored_author():
+    messages = [
+        "BREAKING CHANGE: your upstream dependency have some breaking changes",
+        "docs(README): motivation",
+    ]
+    commits = [
+        GitCommit(rev="test1", title=messages[0], author="alice"),
+        GitCommit(rev="test2", title=messages[1], author="bob"),
+    ]
+    increment_type = bump.find_increment(
+        commits,
+        regex=ConventionalCommitsCz.bump_pattern,
+        increments_map=ConventionalCommitsCz.bump_map,
+        ignore_bump_author_list=["alice"],
+    )
+    assert increment_type is None
+
+
 @pytest.mark.parametrize(
     ("messages", "expected_type"),
     [