feat(commit): add retry_after_failure config option and --no-retry flag

Author: crai0

commitizen/cli.py

@@ -123,6 +123,12 @@ def __call__(
                         "action": "store_true",
                         "help": "retry last commit",
                     },
+                    {
+                        "name": ["--no-retry"],
+                        "action": "store_true",
+                        "default": False,
+                        "help": "skip retry if retry_after_failure is set to true",
+                    },
                     {
                         "name": "--dry-run",
                         "action": "store_true",

commitizen/commands/commit.py

@@ -33,13 +33,16 @@ def __init__(self, config: BaseConfig, arguments: dict):
         self.arguments = arguments
         self.temp_file: str = os.path.join(
             tempfile.gettempdir(),
-            "cz.commit{user}.backup".format(user=os.environ.get("USER", "")),
+            "cz.commit%{user}%{project_root}.backup".format(
+                user=os.environ.get("USER", ""),
+                project_root=str(git.find_git_project_root()).replace("/", "%"),
+            ),
         )
 
-    def read_backup_message(self) -> str:
+    def read_backup_message(self) -> str | None:
         # Check the commit backup file exists
         if not os.path.isfile(self.temp_file):
-            raise NoCommitBackupError()
+            return None
 
         # Read commit message from backup
         with open(self.temp_file, encoding=self.encoding) as f:
@@ -65,7 +68,7 @@ def prompt_commit_questions(self) -> str:
 
     def __call__(self):
         dry_run: bool = self.arguments.get("dry_run")
-        write_message_to_file = self.arguments.get("write_message_to_file")
+        write_message_to_file: bool = self.arguments.get("write_message_to_file")
 
         is_all: bool = self.arguments.get("all")
         if is_all:
@@ -78,9 +81,17 @@ def __call__(self):
             raise NotAllowed(f"{write_message_to_file} is a directory")
 
         retry: bool = self.arguments.get("retry")
+        no_retry: bool = self.arguments.get("no_retry")
+        retry_after_failure: bool = self.config.settings.get("retry_after_failure")
 
         if retry:
             m = self.read_backup_message()
+            if m is None:
+                raise NoCommitBackupError()
+        elif retry_after_failure and not no_retry:
+            m = self.read_backup_message()
+            if m is None:
+                m = self.prompt_commit_questions()
         else:
             m = self.prompt_commit_questions()
 

commitizen/defaults.py

@@ -37,6 +37,7 @@ class Settings(TypedDict, total=False):
     version_type: str | None
     tag_format: str
     bump_message: str | None
+    retry_after_failure: bool
     allow_abort: bool
     allowed_prefixes: list[str]
     changelog_file: str
@@ -77,6 +78,7 @@ class Settings(TypedDict, total=False):
     "version_scheme": None,
     "tag_format": "$version",  # example v$version
     "bump_message": None,  # bumped v$current_version to $new_version
+    "retry_after_failure": False,
     "allow_abort": False,
     "allowed_prefixes": [
         "Merge",