chore: apply PR review suggestions

Author: zimmermannJakob

commitizen/changelog_formats/base.py

@@ -62,10 +62,10 @@ def get_metadata_from_file(self, file: IO[Any]) -> Metadata:
                 meta.unreleased_end = index
 
             # Try to find the latest release done
-            parsed = self.parse_version_from_title(line)
-            if parsed:
-                meta.latest_version = parsed.version
-                meta.latest_version_tag = parsed.tag
+            parsed_version = self.parse_version_from_title(line)
+            if parsed_version:
+                meta.latest_version = parsed_version.version
+                meta.latest_version_tag = parsed_version.tag
                 meta.latest_version_position = index
                 break  # there's no need for more info
         if meta.unreleased_start is not None and meta.unreleased_end is None:
@@ -88,12 +88,14 @@ def get_latest_full_release_from_file(self, file: IO[Any]) -> IncrementalMergeIn
             latest_version_index = index
             line = line.strip().lower()
 
-            parsed = self.parse_version_from_title(line)
-            if parsed:
-                if not self.tag_rules.extract_version(
-                    GitTag(parsed.tag, "", "")
-                ).is_prerelease:
-                    return IncrementalMergeInfo(name=parsed.tag, index=index)
+            parsed_version = self.parse_version_from_title(line)
+            if (
+                parsed_version
+                and not self.tag_rules.extract_version(
+                    GitTag(parsed_version.tag, "", "")
+                ).is_prerelease
+            ):
+                return IncrementalMergeInfo(name=parsed_version.tag, index=index)
         return IncrementalMergeInfo(index=latest_version_index)
 
     def parse_version_from_title(self, line: str) -> VersionTag | None:

commitizen/commands/bump.py

@@ -315,7 +315,7 @@ def __call__(self) -> None:
                 "incremental": True,
                 "dry_run": dry_run,
                 "during_version_bump": self.arguments["prerelease"]
-                is None,  # We let the changelog implementation know that we want to replace prereleases while staying incremental AND the new tag does not exist already
+                is None,  # governs logic for merge_prerelease
             }
             if self.changelog_to_stdout:
                 changelog_cmd = Changelog(

tests/commands/test_bump_command.py

@@ -1728,7 +1728,6 @@ def test_changelog_config_flag_merge_prerelease(
     cli.main()
 
     testargs = ["cz", "bump", "--changelog"]
-
     mocker.patch.object(sys, "argv", testargs)
     cli.main()
 
@@ -1764,7 +1763,6 @@ def test_changelog_config_flag_merge_prerelease_only_prerelease_present(
     cli.main()
 
     testargs = ["cz", "bump", "--changelog"]
-
     mocker.patch.object(sys, "argv", testargs)
     cli.main()