From 24be50111d956989d42997bf84b131727dbbc6ad Mon Sep 17 00:00:00 2001 From: Jonathan Teran Carballo Date: Sun, 14 Dec 2025 13:43:23 -0300 Subject: [PATCH 1/3] feature: hacer pull en rama actual antes de crear nueva rama --- src/git_flow/command/new.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/git_flow/command/new.py b/src/git_flow/command/new.py index 8f23f92..5d262dd 100644 --- a/src/git_flow/command/new.py +++ b/src/git_flow/command/new.py @@ -13,7 +13,7 @@ class NewCommand(Command): def run(self, args: Namespace = Namespace()): self.ensure_initialized() - self.ensure_right_branch() + branch = self.ensure_right_branch() 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 +21,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") From 97b4a56ff7c80538e8a06df97ab73c403699231f Mon Sep 17 00:00:00 2001 From: Jonathan Teran Carballo Date: Sun, 14 Dec 2025 13:46:09 -0300 Subject: [PATCH 2/3] feature: mostrar warning si la rama actual no es un entorno configurado --- src/git_flow/command/new.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/git_flow/command/new.py b/src/git_flow/command/new.py index 5d262dd..18a91ec 100644 --- a/src/git_flow/command/new.py +++ b/src/git_flow/command/new.py @@ -14,6 +14,10 @@ class NewCommand(Command): def run(self, args: Namespace = Namespace()): self.ensure_initialized() 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.") From 01e938ebd9a339642e77ea2c285eaa2b6a44aaaa Mon Sep 17 00:00:00 2001 From: Jonathan Teran Carballo Date: Sun, 14 Dec 2025 21:29:48 -0300 Subject: [PATCH 3/3] feature: agrego opcion para incluir ticket en nombre de rama --- src/git_flow/command/new.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/git_flow/command/new.py b/src/git_flow/command/new.py index 18a91ec..2f142b5 100644 --- a/src/git_flow/command/new.py +++ b/src/git_flow/command/new.py @@ -44,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)