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

feature: 2025 12 21

Approved-by: Jonathan Teran

CHANGELOG.md

@@ -1,3 +1,99 @@
+## v1.11.0 - 2025-12-22
+
+- **feature**:  al agrupar release, mergear cambios en rama group [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (726c73a)
+- **feature**:  usar commit message cuando el pr solo tiene un commit [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (057b32a)
+- **feature**:  eliminar prompt de ticket en creacion de rama [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (c0e2e59)
+- **feature**:  deshacer rebase cuando este falla en el pasaje de cambios [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (77e338d)
+- **bugfix**:  uso titulo personalizado de PR [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (1aa2263)
+
+---
+
+
+## v1.10.0 - 2025-12-15
+
+- **feature**:  agrego opcion para cambiar a rama objetivo y obtener cambios [[jteran](mailto:jteran@renatre.org.ar)] (df8998a)
+- **feature**:  agrego opcion para personalizar nombre de PR [[jteran](mailto:jteran@renatre.org.ar)] (c87b141)
+
+---
+
+
+## v1.9.1 - 2025-12-15
+
+- **bugfix**:  uso rama actual cuando esta es un entorno [[jteran](mailto:jteran@renatre.org.ar)] (c54cb95)
+
+---
+
+
+## v1.9.0 - 2025-12-15
+
+- **bugfix**:  uso env actual en vez de rama actual para listar ramas [[jteran](mailto:jteran@renatre.org.ar)] (5d33b29)
+- **feature**:  listar ramas de todos los entornos con flag --all, y del entorno actual por defecto [[jteran](mailto:jteran@renatre.org.ar)] (104b321)
+- **feature**:  agrego opcion para listar ramas wip [[jteran](mailto:jteran@renatre.org.ar)] (774cf9a)
+- **refactor**:  cambio opcion para listar ramas trash [[jteran](mailto:jteran@renatre.org.ar)] (74c333a)
+- **bugfix**:  elimino : extra de comando new [[jteran](mailto:jteran@renatre.org.ar)] (499babc)
+
+---
+
+
+## v1.8.0 - 2025-12-15
+
+- **feature**:  agrego opcion para incluir ticket en nombre de rama [[jteran](mailto:jteran@renatre.org.ar)] (01e938e)
+- **feature**:  mostrar warning si la rama actual no es un entorno configurado [[jteran](mailto:jteran@renatre.org.ar)] (97b4a56)
+- **feature**:  hacer pull en rama actual antes de crear nueva rama [[jteran](mailto:jteran@renatre.org.ar)] (24be501)
+
+---
+
+
+## v1.7.5 - 2025-12-14
+
+- **bugfix**:  verificar si la rama grupo trackea una rama remota antes de hacer pull [[jteran](mailto:jteran@renatre.org.ar)] (0d95a97)
+- **bugfix**:  capturo interrupion por teclado para no mostrar stack trace [[jteran](mailto:jteran@renatre.org.ar)] (0af5102)
+
+---
+
+
+## v1.7.4 - 2025-12-14
+
+- **bugfix**:  generación de PR de ramas release [[jteran](mailto:jteran@renatre.org.ar)] (b24b22a)
+
+---
+
+
+## v1.7.3 - 2025-12-14
+
+- **bugfix**:  listado de ramas para elegir grupo release no devolvia resultados [[jteran](mailto:jteran@renatre.org.ar)] (5600e5e)
+
+---
+
+
+## v1.7.2 - 2025-12-11
+
+- **bugfix**:  al hacer un release, cambio a la rama grupo si esta disponible [[jteran](mailto:jteran@renatre.org.ar)] (44b8efd)
+
+---
+
+
+## v1.7.1 - 2025-12-11
+
+- **bugfix**:  cambio la forma en la que se obtiene el first fork point entre 2 ramas [[jteran](mailto:jteran@renatre.org.ar)] (7b4fb34)
+
+---
+
+
+## v1.7.0 - 2025-12-11
+
+- **feature**:  muestro el listado de commits a pasar al siguiente entorno en release [[jteran](mailto:jteran@renatre.org.ar)] (2e65cb7)
+
+---
+
+
+## v1.6.4 - 2025-12-10
+
+- **bugfix**:  cambio la lista de commits a mostrar en el merge [[jteran](mailto:jteran@renatre.org.ar)] (4e089dc)
+
+---
+
+
 ## v1.6.3 - 2025-12-04
 
 - **bugfix**:  revertir guion entre version y entorno, agregar guion a sufijo [[jteran](mailto:jteran@renatre.org.ar)] (7ce6add)

src/git_flow/__init__.py

@@ -21,6 +21,9 @@ COMMIT_TYPES = [
     "wip",
 ]
 
+WIP_BRANCH_PREFIX = "wip/"
+TRASH_BRANCH_PREFIX = "trash/"
+
 # Commits con estos valores incrementan el componente correspondiente
 SEMVER_MAJOR = 3
 SEMVER_MINOR = 2

src/git_flow/command/branch.py

@@ -1,5 +1,5 @@
 from argparse import ArgumentParser, Namespace
-from git_flow import COLOR_WHITE_BOLD,  COLOR_GREEN, COLOR_RED, COLOR_RESET, GitFlowError
+from git_flow import COLOR_WHITE_BOLD,  COLOR_GREEN, COLOR_RED, COLOR_RESET, TRASH_BRANCH_PREFIX, WIP_BRANCH_PREFIX, GitFlowError
 from git_flow.command.base import Command
 from git_flow.git import Git
 
@@ -18,7 +18,25 @@ class BranchCommand(Command):
         parser.add_argument(
             "environment",
             nargs="?",
-            help="Entorno de las ramas a listar. Puede ser vacio para listar ramas de todos los entornos, un entorno válido, o 'trash' para listar las ramas eliminadas.",
+            help="Entorno de las ramas a listar. Por defecto, es el entorno actual.",
+        )
+
+        parser.add_argument(
+            "--trash",
+            action="store_true",
+            help=f"Listar ramas en la 'papelera de reciclaje' (ramas que empiezan con '{TRASH_BRANCH_PREFIX}')"
+        )
+
+        parser.add_argument(
+            "--wip",
+            action="store_true",
+            help=f"Listar ramas 'en progreso' (ramas que empiezan con '{WIP_BRANCH_PREFIX}')"
+        )
+
+        parser.add_argument(
+            "--all",
+            action="store_true",
+            help=f"Listar ramas de todos los entornos"
         )
 
         return parser
@@ -29,19 +47,29 @@ class BranchCommand(Command):
         self.current_branch = Git.get_current_branch()
         self.environments = self.flowconfig["flow.branches"].split(",")
 
-        if args.environment is None:
+        if self.current_branch in self.environments:
+            current_environment = self.current_branch
+        else:
+            (current_environment, _) = self.get_branch_env_and_type(self.current_branch)
+
+        if args.trash:
+            self.show_branches(TRASH_BRANCH_PREFIX)
+        elif args.wip:
+            self.show_branches(WIP_BRANCH_PREFIX)
+        elif args.all:
             self.show_envs()
             self.show_all_branches()
+        elif args.environment is None:
+            self.show_envs()
+            self.show_env_branches(current_environment)
         elif args.environment in self.environments:
             self.show_envs()
             self.show_env_branches(args.environment)
-        elif args.environment == "trash":
-            self.show_trash_branches()
         else:
             raise GitFlowError(f"'{args.environment}' no es un entorno válido.")
 
-    def show_trash_branches(self):
-        branches = self.get_trash_branches()
+    def show_branches(self, prefix: str):
+        branches = self.get_branches(prefix)
 
         if not branches:
             print("No hay ramas a mostrar.")
@@ -51,14 +79,14 @@ class BranchCommand(Command):
             prefix = (COLOR_RED + "*") if branch == self.current_branch else " "
             print(prefix + " " + branch + COLOR_RESET)
 
-    def get_trash_branches(self):
-        return Git("for-each-ref", "refs/heads/trash/", format=BRANCH_FORMAT).lines()
+    def get_branches(self, prefix: str):
+        return Git("for-each-ref", "refs/heads/" + prefix, format=BRANCH_FORMAT).lines()
 
     def show_all_branches(self):
         for environment in self.environments:
             self.show_env_branches(environment, len(self.environments) > 1)
 
-        trash = len(self.get_trash_branches())
+        trash = len(self.get_branches(TRASH_BRANCH_PREFIX))
 
         if trash:
             print()
@@ -75,7 +103,7 @@ class BranchCommand(Command):
         is_first_env = environment == self.environments[0]
         pattern = "refs/heads/" if is_first_env else "refs/heads/release/" + environment + "/"
         pattern += "*/*"
-        exclude = ["refs/heads/trash/", "refs/heads/release/"] if is_first_env else []
+        exclude = ["refs/heads/" + TRASH_BRANCH_PREFIX, "refs/heads/release/"] if is_first_env else []
         branches = Git("for-each-ref", pattern, exclude=exclude, format=BRANCH_FORMAT).lines()
 
         print(COLOR_WHITE_BOLD + (environment if show_env else "Ramas") + COLOR_RESET)

src/git_flow/command/commit.py

@@ -1,6 +1,6 @@
 from argparse import Namespace
 from datetime import datetime
-from git_flow import COMMIT_TYPES, GitFlowError
+from git_flow import COMMIT_TYPES, TRASH_BRANCH_PREFIX, WIP_BRANCH_PREFIX, GitFlowError
 from git_flow.command.base import Command
 from git_flow.git import Git
 
@@ -31,8 +31,8 @@ class CommitCommand(Command):
         )
         message = commit_type + ": " + commit_message
 
-        if branch.startswith("wip/"):
-            original_branch = branch.removeprefix("wip/")
+        if branch.startswith(WIP_BRANCH_PREFIX):
+            original_branch = branch.removeprefix(WIP_BRANCH_PREFIX)
             Git("commit", m=message).exec(print="Creando commit en rama WIP")
 
             if commit_type != "wip":
@@ -40,10 +40,10 @@ class CommitCommand(Command):
                 Git("switch", original_branch).exec(print="Volviendo a rama original")
                 Git("merge", branch, squash=True).exec(print="Squasheando commits WIP en uno solo")
                 Git("commit", m=message).exec(print="Creando commit final de rama WIP")
-                Git("branch", branch, "trash/" + branch + "/" + suffix, move=True).exec(print="Backup de rama WIP")
+                Git("branch", branch, TRASH_BRANCH_PREFIX + branch + "/" + suffix, move=True).exec(print="Backup de rama WIP")
         else:
             if commit_type == "wip":
-                Git("switch", "wip/" + branch, create=True).exec(print="Creando nueva rama WIP")
+                Git("switch", WIP_BRANCH_PREFIX + branch, create=True).exec(print="Creando nueva rama WIP")
 
             Git("commit", m=message).exec(print="Creando commit")
 

src/git_flow/command/merge.py

@@ -17,16 +17,15 @@ class MergeCommand(Command):
 
         branch = self.ensure_right_branch()
         (target, _) = self.get_branch_env_and_type(branch)
-        base = Git.get_first_fork_point(branch, target)
 
         if "flow.remote" in self.flowconfig:
             remote = self.flowconfig["flow.remote"]
             token = self.ensure_repository_token()
-            self.run_remote(remote, token, base, branch, target)
+            self.run_remote(remote, token, branch, target)
         else:
-            self.run_local(base, branch, target)
+            self.run_local(branch, target)
 
-    def run_remote(self, remote: str, token: str, base: str, branch: str, target: str):
+    def run_remote(self, remote: str, token: str, branch: str, target: str):
         self.ensure_clean_worktree(True)
 
         Git("switch", target).exec(print="Cambiando a rama destino")
@@ -34,26 +33,26 @@ class MergeCommand(Command):
         Git("switch", "-").exec(print="Volviendo a rama a mergear")
 
         self.check_merge_conflicts(target)
-        self.show_commits_to_merge(base)
+        self.show_commits_to_merge(target)
 
         if self.confirm(f"¿Crear PR de '{branch}' a '{target}'?"):
             Git("push", remote, branch, set_upstream=True).exec(
                 print="Subiendo rama al remoto para crear PR"
             )
 
-            self.create_pull_request(token, base, branch, target)
+            self.create_pull_request(token, branch, target)
 
-    def run_local(self, base: str, branch: str, target: str):
+    def run_local(self, branch: str, target: str):
         self.ensure_clean_worktree(False)
         self.check_merge_conflicts(target)
-        self.show_commits_to_merge(base)
+        self.show_commits_to_merge(target)
 
         if self.confirm(f"¿Mergear rama '{branch}' a '{target}'?"):
             Git("switch", target).exec(print="Cambiando a rama destino")
             Git("merge", branch, ff=False).exec(print="Mergeando")
 
-    def show_commits_to_merge(self, base):
-        commits = Git("log", base + "..", format="%s").lines()
+    def show_commits_to_merge(self, target):
+        commits = Git("log", target + "..", format="%s").lines()
 
         if not commits:
             raise GitFlowError("No hay cambios a mergear.")
@@ -79,14 +78,34 @@ class MergeCommand(Command):
         else:
             self.success("No se detectaron merge conflicts.")
 
-    def create_pull_request(self, token: str, base: str, branch: str, target: str):
+    def create_pull_request(self, token: str, branch: str, target: str):
         changelog = Changelog()
+        commits = Git("log", target + "..", format="%s").lines()
+
+        if len(commits) == 1:
+            title = commits[0]
+        else:
+            title = branch.replace("/", ": ").replace("-", " ")
+
+            if title.startswith("release: "):
+                title = title[title.index(' ', title.index(' ') + 1) + 1:]
+
+        self.info("Título del PR por defecto: " + title)
+
+        opt_title = self.prompt("[Opcional] Ingrese otro titulo para el PR")
+
+        if opt_title:
+            title = opt_title
 
         message = self.get_remote_api(token).create_pull_request(
             branch,
             target,
-            branch.replace("/", ": ").replace("-", " "),
-            changelog.generate_content(base, branch),
+            title,
+            changelog.generate_content(target, branch),
         )
 
         self.success(message)
+
+        if self.confirm("¿Desea cambiar a la rama objetivo y bajar los cambios?"):
+            Git("switch", target).exec(print="Cambiando a rama objetivo")
+            Git("pull").exec(print="Obteniendo cambios")

src/git_flow/command/new.py

@@ -13,7 +13,11 @@ class NewCommand(Command):
 
     def run(self, args: Namespace = Namespace()):
         self.ensure_initialized()
-        self.ensure_right_branch()
+        branch = self.ensure_right_branch()
+        envs = self.flowconfig["flow.branches"].split(",")
+
+        if branch not in envs:
+            self.warning("La rama actual no corresponde a un entorno configurado.")
 
         self.info("Se creará una nueva rama de trabajo sobre la rama actual.")
         self.info("Debe seleccionar el tipo de cambio a realizar.")
@@ -21,6 +25,9 @@ class NewCommand(Command):
         branch_type = self.choice("Tipos de cambio", BRANCH_TYPES)
         new_branch = self._get_unique_branch_name(branch_type)
 
+        if "flow.remote" in self.flowconfig and Git.get_tracking_branch(branch):
+            Git("pull").exec(print="Actualizando rama actual")
+
         if self.confirm(f"¿Crear rama '{new_branch}' sobre la rama actual?"):
             Git("switch", new_branch, create=True).exec(print="Creando nueva rama")
 

src/git_flow/command/release.py

@@ -43,23 +43,34 @@ class ReleaseCommand(Command):
             else f"release/{next_env}/{branch}"
         )
 
+        base = Git.get_first_fork_point(branch, env)
+        commits = Git("log", base + ".." , format="%s").lines()
+
+        if not commits:
+            raise GitFlowError("No hay cambios a mergear.")
+
+        print("Cambios a pasar al proximo entorno:")
+
+        for commit in commits:
+            print("- " + commit)
+
         group = args.group
+        grouping = group is not None
 
-        if not group and self.confirm("¿Desea agrupar este release con otra rama?", False):
-            group = self.choice("Grupo release: ", Git.get_branches("release/" + next_env + "/"))
-        else:
-            group = next_env
+        if not grouping:
+            if self.confirm("¿Desea agrupar este release con otra rama?", False):
+                grouping = True
+                group = self.choice("Grupo release: ", Git.get_branches("release/" + next_env + "/"))
+            else:
+                group = next_env
 
-        if has_remote:
+        if has_remote and Git.get_tracking_branch(group):
             Git("switch", group).exec(print="Cambiando a la rama objetivo")
             Git("pull").exec(print="Sincronizando cambios la rama objetivo")
             Git("switch", "-").exec(print="Volviendo a la rama original")
 
-        base = Git.get_first_fork_point(branch, env)
-        commits = int(Git("rev-list", base + "..", count=True).firstline())
-
-        if commits > 1 and self.confirm(
-            f"¿Desea reemplazar los {commits} commits de la rama por uno solo?",
+        if len(commits) > 1 and self.confirm(
+            f"¿Desea reemplazar los {len(commits)} commits de la rama por uno solo?",
             False
         ):
             self.info("Debe ingresar el mensaje del commit a crear.")
@@ -80,6 +91,15 @@ class ReleaseCommand(Command):
         else:
             Git("switch", next_branch, create=True).exec(print="Creando rama release")
 
-        Git("rebase", base, next_branch, onto=group).exec(
+        status = Git("rebase", base, next_branch, onto=group).code(
             print="Moviendo cambios hacia el siguiente ambiente"
         )
+
+        if status:
+            Git("rebase", abort=True).exec(
+                print="Deshaciendo cambios por conflictos"
+            )
+            raise GitFlowError("Error al realizar pasaje de cambios a rama objetivo")
+        elif grouping:
+            Git("switch", group).exec(print="Cambiando a rama objetivo")
+            Git("merge", next_branch, ff_only=True).exec(print="Mergeando cambios de la nueva rama")

src/git_flow/git.py

@@ -1,5 +1,6 @@
 import subprocess
 
+from git_flow import GitFlowError
 from git_flow.io import *
 
 
@@ -63,32 +64,30 @@ class Git:
 
     @staticmethod
     def get_first_fork_point(branch: str, env: str):
-        boundary_commits = list(
-            filter(
-                lambda c: c.startswith("-"),  # boundary commits
-                Git(
-                    "rev-list", env + "..." + branch, topo_order=True, boundary=True
-                ).lines(),
-            )
-        )
+        # Lista de commits alcanzables por el entorno (por ejemplo, dev),
+        env_commits = Git("rev-list", env + "..." + branch, first_parent=True).lines()
 
-        if not boundary_commits:
+        if not env_commits:
             raise RuntimeError("No se encontro un commit base para realizar el rebase.")
 
-        return boundary_commits[-1].removeprefix("-")
+        return Git("show", env_commits[-1] + "^", patch=False, format="%h").firstline()
 
     @staticmethod
     def _get_references(kind: str):
         prefix = "refs/" + kind
-        return list(map(
-            lambda r: r.removeprefix(prefix),
-            Git("for-each-ref", prefix + "*", format="%(refname)").lines(),
-        ))
+        return Git("for-each-ref", prefix + "**", format="%(refname:short)").lines()
 
     @staticmethod
     def is_repository() -> bool:
         return Git("rev-parse", is_inside_work_tree=True).code() == 0
 
+    @staticmethod
+    def get_tracking_branch(branch: str) -> str | None:
+        try:
+            return Git("rev-parse", branch + "@{upstream}", abbrev_ref=True).firstline()
+        except subprocess.CalledProcessError:
+            return None
+
     def __init__(self, subcommand: str, *args: str, **kwargs: str | int | bool | list[str] | None) -> None:
         self.command = ["git", subcommand]
 

src/git_flow/main.py

@@ -79,6 +79,9 @@ def main():
         command.error(str(e))
     except Exception as e:
         command.error("Ocurrió un error inesperado: " + str(e))
+    except KeyboardInterrupt as e:
+        print()
+        command.error("Ejecución abortada")
 
     return