fix(commands/bump): prevent using incremental changelog when it is set to false in config

Author: josix

commitizen/commands/bump.py

@@ -314,7 +314,9 @@ def __call__(self) -> None:
                 "unreleased_version": new_tag_version,
                 "template": self.template,
                 "extras": self.extras,
-                "incremental": True,
+                "incremental": self.config.mutated_settings.get(
+                            "changelog_incremental", True
+                        ),
                 "dry_run": dry_run,
                 # governs logic for merge_prerelease
                 "during_version_bump": self.arguments["prerelease"] is None,
@@ -330,7 +332,14 @@ def __call__(self) -> None:
 
             changelog_cmd = Changelog(
                 self.config,
-                {**changelog_args, "file_name": self.file_name},  # type: ignore[typeddict-item]
+                {
+                    "unreleased_version": new_tag_version,
+                    "incremental": True,
+                    "dry_run": dry_run,
+                    "template": self.template,
+                    "extras": self.extras,
+                    "file_name": self.file_name,
+                },
             )
             changelog_cmd()
             changelog_file_name = changelog_cmd.file_name

commitizen/config/base_config.py

@@ -19,6 +19,14 @@ class BaseConfig:
     def __init__(self) -> None:
         self._settings: Settings = DEFAULT_SETTINGS.copy()
         self._path: Path | None = None
+        self._settings_from_configs: Settings = {}
+
+    def contains_commitizen_section(self) -> bool:
+        """Check if the config file contains a commitizen section.
+
+        The implementation is different for each config file type.
+        """
+        raise NotImplementedError()
 
     def contains_commitizen_section(self) -> bool:
         """Check if the config file contains a commitizen section.
@@ -31,6 +39,14 @@ def contains_commitizen_section(self) -> bool:
     def settings(self) -> Settings:
         return self._settings
 
+    @property
+    def mutated_settings(self) -> Settings:
+        return self._settings_from_configs
+
+    @property
+    def mutated_settings(self) -> Settings:
+        return self._settings_from_configs
+
     @property
     def path(self) -> Path:
         return self._path  # type: ignore[return-value]

commitizen/config/json_config.py

@@ -63,5 +63,6 @@ def _parse_setting(self, data: bytes | str) -> None:
 
         try:
             self.settings.update(doc["commitizen"])
+            self.mutated_settings.update(doc["commitizen"])
         except KeyError:
             pass

commitizen/config/toml_config.py

@@ -70,5 +70,6 @@ def _parse_setting(self, data: bytes | str) -> None:
 
         try:
             self.settings.update(doc["tool"]["commitizen"])  # type: ignore[index,typeddict-item] # TODO: fix this
+            self.mutated_settings.update(doc["tool"]["commitizen"])  # type: ignore
         except exceptions.NonExistentKey:
             pass

commitizen/config/yaml_config.py

@@ -52,6 +52,7 @@ def _parse_setting(self, data: bytes | str) -> None:
 
         try:
             self.settings.update(doc["commitizen"])
+            self.mutated_settings.update(doc["commitizen"])
         except (KeyError, TypeError):
             pass