feat: add config option for line length warning

Author: Narwhal-fish

commitizen/cli.py

@@ -160,7 +160,6 @@ def __call__(
                     {
                         "name": ["-l", "--message-length-limit"],
                         "type": int,
-                        "default": 0,
                         "help": "length limit of the commit message; 0 for no limit",
                     },
                     {
@@ -499,7 +498,6 @@ def __call__(
                     {
                         "name": ["-l", "--message-length-limit"],
                         "type": int,
-                        "default": 0,
                         "help": "length limit of the commit message; 0 for no limit",
                     },
                 ],

commitizen/commands/check.py

@@ -7,6 +7,7 @@
 from commitizen import factory, git, out
 from commitizen.config import BaseConfig
 from commitizen.exceptions import (
+    CommitMessageLengthExceededError,
     InvalidCommandArgumentError,
     InvalidCommitMessageError,
     NoCommitsFoundError,
@@ -18,7 +19,7 @@ class CheckArgs(TypedDict, total=False):
     commit_msg: str
     rev_range: str
     allow_abort: bool
-    message_length_limit: int
+    message_length_limit: int | None
     allowed_prefixes: list[str]
     message: str
     use_default_range: bool
@@ -41,8 +42,11 @@ def __init__(self, config: BaseConfig, arguments: CheckArgs, *args: object) -> N
         self.allow_abort = bool(
             arguments.get("allow_abort", config.settings["allow_abort"])
         )
+
         self.use_default_range = bool(arguments.get("use_default_range"))
-        self.max_msg_length = arguments.get("message_length_limit", 0)
+        self.max_msg_length = arguments.get(
+            "message_length_limit", config.settings.get("message_length_limit", None)
+        )
 
         # we need to distinguish between None and [], which is a valid value
         allowed_prefixes = arguments.get("allowed_prefixes")
@@ -88,7 +92,7 @@ def __call__(self) -> None:
         invalid_msgs_content = "\n".join(
             f'commit "{commit.rev}": "{commit.message}"'
             for commit in commits
-            if not self._validate_commit_message(commit.message, pattern)
+            if not self._validate_commit_message(commit.message, pattern, commit.rev)
         )
         if invalid_msgs_content:
             # TODO: capitalize the first letter of the error message for consistency in v5
@@ -153,17 +157,22 @@ def _filter_comments(msg: str) -> str:
         return "\n".join(lines)
 
     def _validate_commit_message(
-        self, commit_msg: str, pattern: re.Pattern[str]
+        self, commit_msg: str, pattern: re.Pattern[str], commit_hash: str
     ) -> bool:
         if not commit_msg:
             return self.allow_abort
 
         if any(map(commit_msg.startswith, self.allowed_prefixes)):
             return True
 
-        if self.max_msg_length:
+        if self.max_msg_length is not None:
             msg_len = len(commit_msg.partition("\n")[0].strip())
             if msg_len > self.max_msg_length:
-                return False
+                raise CommitMessageLengthExceededError(
+                    f"commit validation: failed!\n"
+                    f"commit message length exceeds the limit.\n"
+                    f'commit "{commit_hash}": "{commit_msg}"\n'
+                    f"message length limit: {self.max_msg_length} (actual: {msg_len})"
+                )
 
         return bool(pattern.match(commit_msg))

commitizen/commands/commit.py

@@ -33,7 +33,7 @@ class CommitArgs(TypedDict, total=False):
     dry_run: bool
     edit: bool
     extra_cli_args: str
-    message_length_limit: int
+    message_length_limit: int | None
     no_retry: bool
     signoff: bool
     write_message_to_file: Path | None
@@ -80,8 +80,11 @@ def _get_message_by_prompt_commit_questions(self) -> str:
             raise NoAnswersError()
 
         message = self.cz.message(answers)
-        if limit := self.arguments.get("message_length_limit", 0):
+        if limit := self.arguments.get(
+            "message_length_limit", self.config.settings.get("message_length_limit", 0)
+        ):
             self._validate_subject_length(message=message, length_limit=limit)
+
         return message
 
     def _validate_subject_length(self, *, message: str, length_limit: int) -> None:

commitizen/defaults.py

@@ -46,6 +46,7 @@ class Settings(TypedDict, total=False):
     ignored_tag_formats: Sequence[str]
     legacy_tag_formats: Sequence[str]
     major_version_zero: bool
+    message_length_limit: int | None
     name: str
     post_bump_hooks: list[str] | None
     pre_bump_hooks: list[str] | None
@@ -109,6 +110,7 @@ class Settings(TypedDict, total=False):
     "always_signoff": False,
     "template": None,  # default provided by plugin
     "extras": {},
+    "message_length_limit": None,  # None for no limit
 }
 
 MAJOR = "MAJOR"

poetry.lock

@@ -18,7 +18,7 @@ dependencies = [
     "colorama (>=0.4.1,<1.0)",
     "termcolor (>=1.1.0,<4.0.0)",
     "packaging>=19",
-    "tomlkit (>=0.5.3,<1.0.0)",
+    "tomlkit (>=0.8.0,<1.0.0)",
     "jinja2>=2.10.3",
     "pyyaml>=3.08",
     "argcomplete >=1.12.1,<3.7",

pyproject.toml

@@ -8,6 +8,7 @@
 
 from commitizen import cli, commands, git
 from commitizen.exceptions import (
+    CommitMessageLengthExceededError,
     InvalidCommandArgumentError,
     InvalidCommitMessageError,
     NoCommitsFoundError,
@@ -449,7 +450,7 @@ def test_check_command_with_message_length_limit_exceeded(config, mocker: MockFi
         arguments={"message": message, "message_length_limit": len(message) - 1},
     )
 
-    with pytest.raises(InvalidCommitMessageError):
+    with pytest.raises(CommitMessageLengthExceededError):
         check_cmd()
         error_mock.assert_called_once()
 
@@ -460,3 +461,59 @@ def test_check_command_with_amend_prefix_default(config, mocker: MockFixture):
 
     check_cmd()
     success_mock.assert_called_once()
+
+
+def test_check_command_with_config_message_length_limit(config, mocker: MockFixture):
+    success_mock = mocker.patch("commitizen.out.success")
+    message = "fix(scope): some commit message"
+
+    config.settings["message_length_limit"] = len(message) + 1
+
+    check_cmd = commands.Check(
+        config=config,
+        arguments={"message": message},
+    )
+
+    check_cmd()
+    success_mock.assert_called_once()
+
+
+def test_check_command_with_config_message_length_limit_exceeded(
+    config, mocker: MockFixture
+):
+    error_mock = mocker.patch("commitizen.out.error")
+    message = "fix(scope): some commit message"
+
+    config.settings["message_length_limit"] = len(message) - 1
+
+    check_cmd = commands.Check(
+        config=config,
+        arguments={"message": message},
+    )
+
+    with pytest.raises(CommitMessageLengthExceededError):
+        check_cmd()
+        error_mock.assert_called_once()
+
+
+def test_check_command_cli_overrides_config_message_length_limit(
+    config, mocker: MockFixture
+):
+    success_mock = mocker.patch("commitizen.out.success")
+    message = "fix(scope): some commit message"
+
+    config.settings["message_length_limit"] = len(message) - 1
+
+    check_cmd = commands.Check(
+        config=config,
+        arguments={"message": message, "message_length_limit": len(message) + 1},
+    )
+
+    check_cmd()
+    success_mock.assert_called_once()
+
+    success_mock.reset_mock()
+    check_cmd = commands.Check(
+        config=config,
+        arguments={"message": message, "message_length_limit": None},
+    )

tests/commands/test_check_command.py

@@ -554,3 +554,62 @@ def test_commit_when_nothing_added_to_commit(config, mocker: MockFixture, out):
 
     commit_mock.assert_called_once()
     error_mock.assert_called_once_with(out)
+
+
+@pytest.mark.usefixtures("staging_is_clean")
+def test_commit_command_with_config_message_length_limit(config, mocker: MockFixture):
+    prompt_mock = mocker.patch("questionary.prompt")
+    prefix = "feat"
+    subject = "random subject"
+    message_length = len(prefix) + len(": ") + len(subject)
+    prompt_mock.return_value = {
+        "prefix": prefix,
+        "subject": subject,
+        "scope": "",
+        "is_breaking_change": False,
+        "body": "random body",
+        "footer": "random footer",
+    }
+
+    commit_mock = mocker.patch("commitizen.git.commit")
+    commit_mock.return_value = cmd.Command("success", "", b"", b"", 0)
+    success_mock = mocker.patch("commitizen.out.success")
+
+    config.settings["message_length_limit"] = message_length
+    commands.Commit(config, {})()
+    success_mock.assert_called_once()
+
+    config.settings["message_length_limit"] = message_length - 1
+    with pytest.raises(CommitMessageLengthExceededError):
+        commands.Commit(config, {})()
+
+
+@pytest.mark.usefixtures("staging_is_clean")
+def test_commit_command_cli_overrides_config_message_length_limit(
+    config, mocker: MockFixture
+):
+    prompt_mock = mocker.patch("questionary.prompt")
+    prefix = "feat"
+    subject = "random subject"
+    message_length = len(prefix) + len(": ") + len(subject)
+    prompt_mock.return_value = {
+        "prefix": prefix,
+        "subject": subject,
+        "scope": "",
+        "is_breaking_change": False,
+        "body": "random body",
+        "footer": "random footer",
+    }
+
+    commit_mock = mocker.patch("commitizen.git.commit")
+    commit_mock.return_value = cmd.Command("success", "", b"", b"", 0)
+    success_mock = mocker.patch("commitizen.out.success")
+
+    config.settings["message_length_limit"] = message_length - 1
+
+    commands.Commit(config, {"message_length_limit": message_length})()
+    success_mock.assert_called_once()
+
+    success_mock.reset_mock()
+    commands.Commit(config, {"message_length_limit": None})()
+    success_mock.assert_called_once()

tests/commands/test_commit_command.py

@@ -105,6 +105,7 @@
     "always_signoff": False,
     "template": None,
     "extras": {},
+    "message_length_limit": None,
 }
 
 _new_settings: dict[str, Any] = {
@@ -143,6 +144,7 @@
     "always_signoff": False,
     "template": None,
     "extras": {},
+    "message_length_limit": None,
 }