chore: merge master into fm/commitizen-doc-example-checks

# Conflicts:
#	commitizen/bump.py
#	commitizen/commands/bump.py
#	tests/test_bump_find_increment.py

Author: bearomorphism

.pre-commit-config.yaml

@@ -56,7 +56,7 @@ repos:
           - tomli
 
   - repo: https://github.com/commitizen-tools/commitizen
-    rev: v4.19.0 # automatically updated by Commitizen
+    rev: v4.19.1 # automatically updated by Commitizen
     hooks:
       - id: commitizen
       - id: commitizen-branch

CHANGELOG.md

@@ -1,3 +1,9 @@
+## v4.19.1 (2026-10-03)
+
+### Refactor
+
+- **bump**: use VersionIncrement ordering for bump detection (#2097)
+
 ## v4.19.0 (2026-09-22)
 
 ### Feat

commitizen/__version__.py

@@ -1 +1 @@
-__version__ = "4.19.0"
+__version__ = "4.19.1"

commitizen/bump.py

@@ -4,37 +4,16 @@
 import re
 from glob import iglob
 from string import Template
-from typing import TYPE_CHECKING, cast
+from typing import TYPE_CHECKING
 
 from commitizen.defaults import BUMP_MESSAGE
 from commitizen.exceptions import CurrentVersionNotFoundError
 from commitizen.git import smart_open
-from commitizen.version_increment import VersionIncrement
 
 if TYPE_CHECKING:
-    from collections.abc import Generator, Iterable, Mapping
+    from collections.abc import Generator, Iterable
 
-    from commitizen.git import GitCommit
-    from commitizen.version_schemes import Increment, VersionProtocol
-
-
-def find_increment(
-    commits: list[GitCommit], regex: str, increments_map: Mapping[str, object]
-) -> Increment | None:
-    """Preserve the legacy bump helper as a compatibility shim.
-
-    This public helper remains available for integrations importing
-    ``commitizen.bump.find_increment`` while delegating the real increment
-    comparison and extraction logic to ``VersionIncrement``.
-    """
-    increment = VersionIncrement.get_highest_by_messages(
-        (commit.message for commit in commits),
-        regex,
-        increments_map,
-    )
-    if increment == VersionIncrement.NONE:
-        return None
-    return cast("Increment", str(increment))
+    from commitizen.version_schemes import VersionProtocol
 
 
 def update_version_in_files(

commitizen/commands/bump.py

@@ -160,8 +160,11 @@ def _find_increment(self, commits: list[git.GitCommit]) -> Increment | None:
                 f"'{self.config.settings['name']}' rule does not support bump"
             )
 
+        commit_messages = (
+            commit.message for commit in self.cz.filter_commits_before_bump(commits)
+        )
         increment = VersionIncrement.get_highest_by_messages(
-            (commit.message for commit in self.cz.filter_commits_before_bump(commits)),
+            commit_messages,
             bump_pattern,
             bump_map,
         )