fix(commit): resolve conflicts with upstream master

Author: yjaw

.pre-commit-config.yaml

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

.pre-commit-hooks.yaml

@@ -19,9 +19,10 @@
     the fact (e.g., pre-push or in CI) without an expensive check of the entire
     repository history.
   entry: cz check
-  args: [--rev-range, origin/HEAD..HEAD]
+  args: [--rev-range, "$PRE_COMMIT_FROM_REF..$PRE_COMMIT_TO_REF"]
   always_run: true
   pass_filenames: false
   language: python
   language_version: python3
   minimum_pre_commit_version: "3.2.0"
+  stages: [pre-push]

CHANGELOG.md

@@ -1,3 +1,46 @@
+## v4.13.7 (2026-02-09)
+
+### Fix
+
+- **provider**: use encoding settings in config (#1857)
+
+## v4.13.6 (2026-02-07)
+
+### Fix
+
+- **bump**: preserve existing changelog header when `changelog_merge_prerelease` is used with `cz bump --changelog` (#1850)
+
+## v4.13.5 (2026-02-05)
+
+### Fix
+
+- **changelog**: add incremental parameter to changelog generation (#1808)
+
+## v4.13.4 (2026-02-04)
+
+### Fix
+
+- **pre-commit-hooks**: correct rev-range syntax in commitizen-branch (#1841)
+
+## v4.13.3 (2026-02-04)
+
+### Refactor
+
+- **version_schemes**: shorten generate_prerelease (#1838)
+
+## v4.13.2 (2026-02-03)
+
+### Refactor
+
+- simplify code with pathlib Path object (#1840)
+- **tags**: extract version resolution method (#1839)
+
+## v4.13.1 (2026-02-03)
+
+### Refactor
+
+- **config**: replace is_empty_config with contains_commitizen_section, improve multi config resolution algorithm (#1842)
+
 ## v4.13.0 (2026-02-01)
 
 ### Feat

commitizen/__version__.py

@@ -1 +1 @@
-__version__ = "4.13.0"
+__version__ = "4.13.7"

commitizen/changelog_formats/base.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-import os
 from abc import ABCMeta
+from pathlib import Path
 from typing import IO, TYPE_CHECKING, Any, ClassVar
 
 from commitizen.changelog import IncrementalMergeInfo, Metadata
@@ -36,12 +36,11 @@ def __init__(self, config: BaseConfig) -> None:
         )
 
     def get_metadata(self, filepath: str) -> Metadata:
-        if not os.path.isfile(filepath):
+        file = Path(filepath)
+        if not file.is_file():
             return Metadata()
 
-        with open(
-            filepath, encoding=self.config.settings["encoding"]
-        ) as changelog_file:
+        with file.open(encoding=self.config.settings["encoding"]) as changelog_file:
             return self.get_metadata_from_file(changelog_file)
 
     def get_metadata_from_file(self, file: IO[Any]) -> Metadata:
@@ -74,12 +73,11 @@ def get_metadata_from_file(self, file: IO[Any]) -> Metadata:
         return meta
 
     def get_latest_full_release(self, filepath: str) -> IncrementalMergeInfo:
-        if not os.path.isfile(filepath):
+        file = Path(filepath)
+        if not file.is_file():
             return IncrementalMergeInfo()
 
-        with open(
-            filepath, encoding=self.config.settings["encoding"]
-        ) as changelog_file:
+        with file.open(encoding=self.config.settings["encoding"]) as changelog_file:
             return self.get_latest_full_release_from_file(changelog_file)
 
     def get_latest_full_release_from_file(self, file: IO[Any]) -> IncrementalMergeInfo:

commitizen/commands/changelog.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-import os
-import os.path
 from difflib import SequenceMatcher
 from operator import itemgetter
 from pathlib import Path
@@ -66,7 +64,7 @@ def __init__(self, config: BaseConfig, arguments: ChangelogArgs) -> None:
                 f"or the setting `changelog_file` in {self.config.path}"
             )
         self.file_name = (
-            os.path.join(str(self.config.path.parent), changelog_file_name)
+            Path(self.config.path.parent, changelog_file_name).as_posix()
             if self.config.path is not None
             else changelog_file_name
         )
@@ -229,16 +227,32 @@ def __call__(self) -> None:
             latest_full_release_info = self.changelog_format.get_latest_full_release(
                 self.file_name
             )
-            if latest_full_release_info.index:
-                changelog_meta.unreleased_start = 0
+            # Determine if there are prereleases to merge:
+            # - Only prereleases in changelog (no full release found), OR
+            # - First version in changelog is before first full release (prereleases exist)
+            if latest_full_release_info.index is not None and (
+                latest_full_release_info.name is None
+                or (
+                    changelog_meta.latest_version_position is not None
+                    and changelog_meta.latest_version_position
+                    < latest_full_release_info.index
+                )
+            ):
+                # Use the existing unreleased_start if available (from get_metadata()).
+                # Otherwise, use the position of the first version entry (prerelease)
+                # to preserve the changelog header.
+                if changelog_meta.unreleased_start is None:
+                    changelog_meta.unreleased_start = (
+                        changelog_meta.latest_version_position
+                    )
                 changelog_meta.latest_version_position = latest_full_release_info.index
                 changelog_meta.unreleased_end = latest_full_release_info.index - 1
 
-            start_rev = latest_full_release_info.name or ""
-            if not start_rev and latest_full_release_info.index:
-                # Only pre-releases in changelog
-                changelog_meta.latest_version_position = None
-                changelog_meta.unreleased_end = latest_full_release_info.index + 1
+                start_rev = latest_full_release_info.name or ""
+                if not start_rev:
+                    # Only pre-releases in changelog
+                    changelog_meta.latest_version_position = None
+                    changelog_meta.unreleased_end = latest_full_release_info.index + 1
 
         commits = git.get_commits(start=start_rev, end=end_rev, args="--topo-order")
         if not commits and (
@@ -268,6 +282,7 @@ def __call__(self) -> None:
             self.cz.template_loader,
             self.template,
             **{
+                "incremental": self.incremental,  # extra variable for the template
                 **self.cz.template_extras,
                 **self.config.settings["extras"],
                 **self.extras,
@@ -282,9 +297,10 @@ def __call__(self) -> None:
             raise DryRunExit()
 
         lines = []
-        if self.incremental and os.path.isfile(self.file_name):
-            with open(
-                self.file_name, encoding=self.config.settings["encoding"]
+        changelog_path = Path(self.file_name)
+        if self.incremental and changelog_path.is_file():
+            with changelog_path.open(
+                encoding=self.config.settings["encoding"]
             ) as changelog_file:
                 lines = changelog_file.readlines()
 

commitizen/commands/check.py

@@ -2,6 +2,7 @@
 
 import re
 import sys
+from pathlib import Path
 from typing import TYPE_CHECKING, TypedDict
 
 from commitizen import factory, git, out
@@ -116,11 +117,10 @@ def _get_commit_message(self) -> str | None:
             # Get commit message from command line (--message)
             return self.commit_msg
 
-        with open(
-            self.commit_msg_file, encoding=self.config.settings["encoding"]
-        ) as commit_file:
-            # Get commit message from file (--commit-msg-file)
-            return commit_file.read()
+        # Get commit message from file (--commit-msg-file)
+        return Path(self.commit_msg_file).read_text(
+            encoding=self.config.settings["encoding"]
+        )
 
     def _get_commits(self) -> list[git.GitCommit]:
         if (msg := self._get_commit_message()) is not None:

commitizen/commands/commit.py

@@ -7,6 +7,7 @@
 import tempfile
 import textwrap
 from itertools import chain
+from pathlib import Path
 from typing import TYPE_CHECKING, TypedDict
 
 import questionary
@@ -28,8 +29,6 @@
 from commitizen.git import smart_open
 
 if TYPE_CHECKING:
-    from pathlib import Path
-
     from commitizen.config import BaseConfig
 
 
@@ -64,10 +63,9 @@ def _read_backup_message(self) -> str | None:
             return None
 
         # Read commit message from backup
-        with open(
-            self.backup_file_path, encoding=self.config.settings["encoding"]
-        ) as f:
-            return f.read().strip()
+        return self.backup_file_path.read_text(
+            encoding=self.config.settings["encoding"]
+        ).strip()
 
     def _get_message_by_prompt_commit_questions(self) -> str:
         # Prompt user for the commit message
@@ -140,8 +138,7 @@ def manual_edit(self, message: str) -> str:
         file_path = file.name
         argv = [exec_path, file_path]
         subprocess.call(argv)
-        with open(file_path) as temp_file:
-            message = temp_file.read().strip()
+        message = Path(file_path).read_text().strip()
         os.unlink(file.name)
         return message
 

commitizen/commands/init.py

@@ -171,24 +171,31 @@ def _ask_config_path(self) -> Path:
     def _ask_name(self) -> str:
         name: str = questionary.select(
             f"Please choose a cz (commit rule): (default: {DEFAULT_SETTINGS['name']})",
-            choices=self._construct_name_choice_with_description(),
+            choices=self._construct_name_choices_from_registry(),
             default=DEFAULT_SETTINGS["name"],
             style=self.cz.style,
         ).unsafe_ask()
         return name
 
-    def _construct_name_choice_with_description(self) -> list[questionary.Choice]:
+    def _construct_name_choices_from_registry(self) -> list[questionary.Choice]:
+        """
+        Construct questionary choices of cz names from registry.
+        """
         choices = []
         for cz_name, cz_class in registry.items():
             try:
                 cz_obj = cz_class(self.config)
             except MissingCzCustomizeConfigError:
+                # Fallback if description is not available
                 choices.append(questionary.Choice(title=cz_name, value=cz_name))
                 continue
-            first_example = cz_obj.schema().partition("\n")[0]
+
+            # Get the first line of the schema as the description
+            # TODO(bearomorphism): schema is a workaround. Add a description method to the cz class.
+            description = cz_obj.schema().partition("\n")[0]
             choices.append(
                 questionary.Choice(
-                    title=cz_name, value=cz_name, description=first_example
+                    title=cz_name, value=cz_name, description=description
                 )
             )
         return choices
@@ -288,11 +295,12 @@ def _get_config_data(self) -> dict[str, Any]:
             ],
         }
 
-        if not Path(".pre-commit-config.yaml").is_file():
+        pre_commit_config_path = Path(self._PRE_COMMIT_CONFIG_PATH)
+        if not pre_commit_config_path.is_file():
             return {"repos": [CZ_HOOK_CONFIG]}
 
-        with open(
-            self._PRE_COMMIT_CONFIG_PATH, encoding=self.config.settings["encoding"]
+        with pre_commit_config_path.open(
+            encoding=self.config.settings["encoding"]
         ) as config_file:
             config_data: dict[str, Any] = yaml.safe_load(config_file) or {}
 

commitizen/config/__init__.py

@@ -13,40 +13,31 @@ def _resolve_config_candidates() -> list[BaseConfig]:
     git_project_root = git.find_git_project_root()
     cfg_search_paths = [Path(".")]
 
-    if git_project_root and not cfg_search_paths[0].samefile(git_project_root):
+    if git_project_root and cfg_search_paths[0].resolve() != git_project_root.resolve():
         cfg_search_paths.append(git_project_root)
 
-    # The following algorithm is ugly, but we need to ensure that the order of the candidates are preserved before v5.
-    # Also, the number of possible config files is limited, so the complexity is not a problem.
     candidates: list[BaseConfig] = []
     for dir in cfg_search_paths:
         for filename in defaults.CONFIG_FILES:
-            out_path = dir / Path(filename)
-            if (
-                out_path.exists()
-                and not any(
-                    out_path.samefile(candidate.path) for candidate in candidates
-                )
-                and not (conf := _create_config_from_path(out_path)).is_empty_config
-            ):
-                candidates.append(conf)
+            out_path = dir / filename
+            if out_path.is_file():
+                conf = _create_config_from_path(out_path)
+                if conf.contains_commitizen_section():
+                    candidates.append(conf)
     return candidates
 
 
 def _create_config_from_path(path: Path) -> BaseConfig:
-    with open(path, "rb") as f:
-        data: bytes = f.read()
-
-    return create_config(data=data, path=path)
+    return create_config(data=path.read_bytes(), path=path)
 
 
 def read_cfg(filepath: str | None = None) -> BaseConfig:
     if filepath is not None:
         conf_path = Path(filepath)
-        if not conf_path.exists():
+        if not conf_path.is_file():
             raise ConfigFileNotFound()
         conf = _create_config_from_path(conf_path)
-        if conf.is_empty_config:
+        if not conf.contains_commitizen_section():
             raise ConfigFileIsEmpty()
         return conf