fix: clarify allow-no-commit changelog behavior and docs

Align internal typing/forwarding for allow_no_commit, simplify the regression test setup, and document how changelog entries are generated during no-commit bumps.

Made-with: Cursor

Author: bearomorphism

commitizen/commands/bump.py

@@ -333,7 +333,7 @@ def __call__(self) -> None:
                 {
                     **changelog_args,  # type: ignore[typeddict-item]
                     "file_name": self.file_name,
-                    "allow_no_commit": self.arguments["allow_no_commit"],
+                    "allow_no_commit": bool(self.arguments["allow_no_commit"]),
                 },
             )
             changelog_cmd()

commitizen/commands/changelog.py

@@ -43,7 +43,7 @@ class ChangelogArgs(TypedDict, total=False):
     extras: dict[str, Any]
     export_template: str
     during_version_bump: bool | None
-    allow_no_commit: bool  # --allow-no-commit is still invalid in the changelog command
+    allow_no_commit: bool | None
 
 
 class Changelog:
@@ -125,7 +125,8 @@ def __init__(self, config: BaseConfig, arguments: ChangelogArgs) -> None:
         self.export_template_to = arguments.get("export_template")
 
         self.during_version_bump: bool = arguments.get("during_version_bump") or False
-        self.allow_no_commit: bool = arguments.get("allow_no_commit") or False
+        # Internal flag used when changelog is invoked from `cz bump --allow-no-commit`.
+        self.allow_no_commit: bool = bool(arguments.get("allow_no_commit"))
 
     def _find_incremental_rev(self, latest_version: str, tags: Iterable[GitTag]) -> str:
         """Try to find the 'start_rev'.

docs/commands/bump.md

@@ -473,6 +473,11 @@ cz bump --allow-no-commit 2.0.0
     cz bump --allow-no-commit 2.0.0
     ```
 
+!!! note "Behavior with changelog updates"
+    When `update_changelog_on_bump = true` (or `--changelog` is used), `cz bump --allow-no-commit` also generates a changelog entry even if there are no commits in the selected range.
+
+    This makes the new release visible in the changelog while still showing that no commit-based changes were included.
+
 ### `--tag-format`
 
 `tag_format` and [version_scheme][version_scheme] are combined to make Git tag names from versions.

docs/commands/changelog.md

@@ -2,6 +2,8 @@
 
 Generates a changelog following the committing rules established.
 
+When changelog generation is triggered by `cz bump --allow-no-commit` (with `--changelog` or `update_changelog_on_bump = true`), Commitizen still creates a release entry even when no commits are found in the selected revision range.
+
 !!! tip
     To create the changelog automatically on bump, add the setting [update_changelog_on_bump](../config/bump.md#update_changelog_on_bump)
 

tests/commands/test_bump_command.py

@@ -1548,33 +1548,9 @@ def test_bump_allow_no_commit_issue(
     util: UtilFixture,
 ) -> None:
     """Issue #1866: bump command called changelog command with allow_no_commit=True, but changelog command raised NoCommitsFoundError"""
-    tmp_commitizen_project = tmp_commitizen_project_initial(version="1.0.0")
-    with (tmp_commitizen_project / "pyproject.toml").open("w") as f:
-        f.write(
-            dedent(
-                r"""
-            [project]
-            name = "abc"
-            version = "4.14.0"
-
-            [tool.commitizen]
-            name = "cz_customize"
-            tag_format = "$version"
-            version_scheme = "semver2"
-            version_provider = "pep621"
-            update_changelog_on_bump = true
-
-            [tool.commitizen.customize]
-            bump_pattern = '^(feat|fix|ci|build|perf|refactor|chore|remove|style|test)'
-            bump_map = {feat = "MINOR", fix = "PATCH", ci = "PATCH", build = "PATCH", perf = "PATCH", refactor = "PATCH", chore = "PATCH", remove = "PATCH", style = "PATCH", test = "PATCH" }
-            schema_pattern = "(build|bump|chore|ci|dev|docs|feat|fix|perf|refactor|remove|style|test):(\\s.*)"
-            commit_parser = "^(?P<change_type>build|bump|chore|ci|dev|docs|feat|fix|perf|refactor|remove|style|test):\\s(?P<message>.*)?"
-            change_type_map = {"feat" = "New Features", "fix" = "Bug Fixes", "perf" = "Performance Improvements", "refactor" = "Refactoring", "chore" = "General Improvements", "remove" = "Removed", "style" = "Stylistic Changes", "test" = "Testing", "build" = "Build"}
-            change_type_order = ["BREAKING CHANGE", "New Features", "Bug Fixes", "Performance Improvements", "Refactoring", "General Improvements", "Removed", "Stylistic Changes", "Testing", "Build"]
-            changelog_pattern = "^(build|chore|feat|fix|perf|refactor|remove|style|test)"
-"""
-            )
-        )
+    tmp_commitizen_project_initial(
+        version="1.0.0", config_extra="update_changelog_on_bump = true\n"
+    )
     util.run_cli("bump", "--yes", "--allow-no-commit", "--prerelease", "beta")
     util.run_cli(
         "bump", "--allow-no-commit", "--prerelease", "rc"