Merge branch 'master' into fix-cz-bump-subdir-path​

Author: Yusin0903

.pre-commit-config.yaml

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

CHANGELOG.md

@@ -1,3 +1,26 @@
+## v4.6.0 (2025-04-13)
+
+### Feat
+
+- **changelog**: expose commit parents' digests when processing commits
+- **git**: add parents' digests in commit information
+
+## v4.5.1 (2025-04-09)
+
+### Fix
+
+- print which tag is invalid
+
+## v4.5.0 (2025-04-04)
+
+### Feat
+
+- **init**: set uv to default value if both pyproject.toml and uv.lock present
+
+### Fix
+
+- **commands/init**: add missing uv provider to "cz init"
+
 ## v4.4.1 (2025-03-02)
 
 ### Fix

commitizen/__version__.py

@@ -1 +1 @@
-__version__ = "4.4.1"
+__version__ = "4.6.0"

commitizen/changelog.py

@@ -172,6 +172,7 @@ def process_commit_message(
 ):
     message: dict = {
         "sha1": commit.rev,
+        "parents": commit.parents,
         "author": commit.author,
         "author_email": commit.author_email,
         **parsed.groupdict(),

commitizen/commands/init.py

@@ -24,6 +24,10 @@ class ProjectInfo:
     def has_pyproject(self) -> bool:
         return os.path.isfile("pyproject.toml")
 
+    @property
+    def has_uv_lock(self) -> bool:
+        return os.path.isfile("uv.lock")
+
     @property
     def has_setup(self) -> bool:
         return os.path.isfile("setup.py")
@@ -32,6 +36,10 @@ def has_setup(self) -> bool:
     def has_pre_commit_config(self) -> bool:
         return os.path.isfile(".pre-commit-config.yaml")
 
+    @property
+    def is_python_uv(self) -> bool:
+        return self.has_pyproject and self.has_uv_lock
+
     @property
     def is_python_poetry(self) -> bool:
         if not self.has_pyproject:
@@ -228,13 +236,16 @@ def _ask_version_provider(self) -> str:
             "npm": "npm: Get and set version from package.json:project.version field",
             "pep621": "pep621: Get and set version from pyproject.toml:project.version field",
             "poetry": "poetry: Get and set version from pyproject.toml:tool.poetry.version field",
+            "uv": "uv: Get and Get and set version from pyproject.toml and uv.lock",
             "scm": "scm: Fetch the version from git and does not need to set it back",
         }
 
         default_val = "commitizen"
         if self.project_info.is_python:
             if self.project_info.is_python_poetry:
                 default_val = "poetry"
+            elif self.project_info.is_python_uv:
+                default_val = "uv"
             else:
                 default_val = "pep621"
         elif self.project_info.is_rust_cargo:

commitizen/git.py

@@ -44,13 +44,20 @@ def __eq__(self, other) -> bool:
 
 class GitCommit(GitObject):
     def __init__(
-        self, rev, title, body: str = "", author: str = "", author_email: str = ""
+        self,
+        rev,
+        title,
+        body: str = "",
+        author: str = "",
+        author_email: str = "",
+        parents: list[str] | None = None,
     ):
         self.rev = rev.strip()
         self.title = title.strip()
         self.body = body.strip()
         self.author = author.strip()
         self.author_email = author_email.strip()
+        self.parents = parents or []
 
     @property
     def message(self):
@@ -137,14 +144,17 @@ def get_commits(
     for rev_and_commit in git_log_entries:
         if not rev_and_commit:
             continue
-        rev, title, author, author_email, *body_list = rev_and_commit.split("\n")
+        rev, parents, title, author, author_email, *body_list = rev_and_commit.split(
+            "\n"
+        )
         if rev_and_commit:
             git_commit = GitCommit(
                 rev=rev.strip(),
                 title=title.strip(),
                 body="\n".join(body_list).strip(),
                 author=author,
                 author_email=author_email,
+                parents=[p for p in parents.strip().split(" ") if p],
             )
             git_commits.append(git_commit)
     return git_commits
@@ -286,7 +296,7 @@ def smart_open(*args, **kargs):
 def _get_log_as_str_list(start: str | None, end: str, args: str) -> list[str]:
     """Get string representation of each log entry"""
     delimiter = "----------commit-delimiter----------"
-    log_format: str = "%H%n%s%n%an%n%ae%n%b"
+    log_format: str = "%H%n%P%n%s%n%an%n%ae%n%b"
     git_log_cmd = (
         f"git -c log.showSignature=False log --pretty={log_format}{delimiter} {args}"
     )

commitizen/tags.py

@@ -146,7 +146,9 @@ def extract_version(self, tag: GitTag) -> Version:
             m for regex in self.version_regexes if (m := regex.fullmatch(tag.name))
         )
         if not (m := next(candidates, None)):
-            raise InvalidVersion()
+            raise InvalidVersion(
+                f"Invalid version tag: '{tag.name}' does not match any configured tag format"
+            )
         if "version" in m.groupdict():
             return self.scheme(m.group("version"))
 

docs/customization.md

@@ -507,12 +507,16 @@ Each `Change` has the following fields:
 | scope | `str | None` | An optional scope |
 | message | `str` | The commit message body |
 | sha1 | `str` | The commit `sha1` |
+| parents | `list[str]` | The parent commit(s) `sha1`(s) |
 | author | `str` | The commit author name |
 | author_email | `str` | The commit author email |
 
 !!! Note
     The field values depend on the customization class and/or the settings you provide
 
+The `parents` field can be used to identify merge commits and generate a changelog based on those. Another use case
+is listing commits that belong to the same pull request.
+
 When using another template (either provided by a plugin or by yourself), you can also pass extra template variables
 by:
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "commitizen"
-version = "4.4.1"
+version = "4.6.0"
 description = "Python commitizen client tool"
 authors = [{ name = "Santiago Fraire", email = "santiwilly@gmail.com" }]
 maintainers = [
@@ -88,7 +88,7 @@ build-backend = "poetry.core.masonry.api"
 
 
 [tool.commitizen]
-version = "4.4.1"
+version = "4.6.0"
 tag_format = "v$version"
 version_files = [
     "pyproject.toml:version",