chore: bump version and update CHANGELOG.md [skip ci]

Reviewed-on: #22

CHANGELOG.md

@@ -1,3 +1,17 @@
+## v1.21.2 - 2026-09-18
+
+- **bugfix**:  agrego informacion de traceback para errores de GitFlow [[jteran](mailto:jteran@renatre.org.ar)] (8a4cf6e)
+
+---
+
+
+## v1.21.1 - 2026-09-17
+
+- **bugfix**:  apply release prefix and ticket detection to single-commit PR titles [[jteran](mailto:jteran@renatre.org.ar)] (e0200e3)
+
+---
+
+
 ## v1.21.0 - 2026-09-17
 
 - **feature**:  downgrade python version for better compatibility [[jteran](mailto:jteran@renatre.org.ar)] (55172bd)

src/git_flow/command/merge.py

@@ -1,3 +1,5 @@
+from typing import Optional
+
 import typer
 
 import git_flow.command.base as base
@@ -102,7 +104,7 @@ def check_merge_conflicts(target: str):
 def create_pull_request(token: str, branch: str, target: str):
     changelog = Changelog()
     commits = Git("log", target + "..", format="%s").lines()
-    title = commits[0] if len(commits) == 1 else _get_pr_title_from_branch(branch)
+    title = _get_pr_title(branch, commits)
 
     base.panel("Título del PR", title)
 
@@ -120,34 +122,42 @@ def create_pull_request(token: str, branch: str, target: str):
     base.io_success(message, "Rama creada")
 
 
-def _get_pr_title_from_branch(branch: str) -> str:
+def _get_pr_title(branch: str, commits: list[str]) -> str:
     if branch in base.environments:
         target = base.environments[base.environments.index(branch) + 1]
         return f"Sincronización de entorno {branch} a {target}"
 
     components = branch.split("/")  # <type>/<desc> or release/<env>/<type>/<desc>
+    release_prefix = f"[Pasaje a {components[1]}]" if len(components) == 4 else None
     branch_type = components[-2]
-    branch_desc = components[-1]
+    branch_ticket, branch_desc = _extract_ticket_from_branch(components[-1])
 
-    # detect if branch description has ticket as prefix: <desc> = ABC-123-my-branch-name
-    branch_ticket = None
-    first_dash = branch_desc.find("-")
-    second_dash = branch_desc.find("-", first_dash + 1)
-
-    if first_dash >= 0 and second_dash >= 0:
-        maybe_ticket = branch_desc[:second_dash]
-        if base.is_valid_ticket(maybe_ticket):
-            branch_ticket = maybe_ticket
-            branch_desc = branch_desc[second_dash + 1 :]
+    # when there's a single commit, use it as the PR description instead of
+    # deriving one from the branch name, but keep the release prefix / ticket
+    if len(commits) == 1:
+        return " ".join(filter(None, [release_prefix, branch_ticket, commits[0]]))
 
     return " ".join(
         filter(
             None,
             [
-                f"[Pasaje a {components[1]}]" if len(components) == 4 else None,
+                release_prefix,
                 branch_type + ":",
                 branch_ticket,
                 branch_desc.replace("-", " "),
             ],
         )
     )
+
+
+def _extract_ticket_from_branch(branch_desc: str) -> tuple[Optional[str], str]:
+    """detect if branch description has ticket as prefix: <desc> = ABC-123-my-branch-name"""
+    first_dash = branch_desc.find("-")
+    second_dash = branch_desc.find("-", first_dash + 1)
+
+    if first_dash >= 0 and second_dash >= 0:
+        maybe_ticket = branch_desc[:second_dash]
+        if base.is_valid_ticket(maybe_ticket):
+            return maybe_ticket, branch_desc[second_dash + 1 :]
+
+    return None, branch_desc

src/git_flow/main.py

@@ -1,10 +1,12 @@
 #!/usr/bin/env python3
 
+import traceback
+from subprocess import SubprocessError
+
 import typer
 
 from git_flow import GitFlowError
-import git_flow.command.base as base
-from git_flow.command import init, new, commit, merge, tag, release, branch
+from git_flow.command import base, branch, commit, init, merge, new, release, tag
 
 REPOSITORY_TOKEN_PATH = ".repository-token"
 LOCALE = "es_AR.UTF-8"
@@ -25,8 +27,8 @@ def main():
         app()
         print()
     except GitFlowError as e:
-        base.io_error(str(e), title="Git Flow")
-    except Exception as e:
-        base.io_error(str(e), title="Inesperado")
-    except KeyboardInterrupt as e:
+        base.io_error("".join(traceback.format_exception(e)), title="Git Flow: " + str(e))
+    except SubprocessError as e:
+        base.io_error(str(e), title="Comando")
+    except KeyboardInterrupt:
         base.io_error("Ejecución abortada")