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

feature: new command improvements

Approved-by: Jonathan Teran

CHANGELOG.md

@@ -1,3 +1,62 @@
+## 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/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,18 @@ 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()
+        title = branch.replace("/", ": ").replace("-", " ")
+
+        if title.startswith("release: "):
+            title = title[title.index(' ', title.index(' ') + 1) + 1:]
 
         message = self.get_remote_api(token).create_pull_request(
             branch,
             target,
             branch.replace("/", ": ").replace("-", " "),
-            changelog.generate_content(base, branch),
+            changelog.generate_content(target, branch),
         )
 
         self.success(message)

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")
 
@@ -37,6 +44,9 @@ class NewCommand(Command):
                 persistent=True,
             )
 
+            ticket = self.prompt("[Opcional] Ingrese el ID del ticket (por ejemplo: ABC-123 o #123):")
+            ticket = ticket[1:] if ticket.startswith("#") else ticket
+            keywords = ticket + ' ' + keywords
             keywords = filter(lambda k: len(k) > 0, keywords.split(" "))
             branch = branch_type + "/" + "-".join(keywords)
 

src/git_flow/command/release.py

@@ -43,23 +43,32 @@ 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
 
-        if not group and self.confirm("¿Desea agrupar este release con otra rama?", False):
+        if not group:
+            if 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 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.")

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