bugfix: arreglo mensaje de confirmacion de squash, muevo prompt de commit message antes del squash

This commit is contained in:
jt
2025-11-29 13:40:34 -03:00
parent 83df7e9553
commit f1f6e6724c
+10 -7
View File
@@ -59,20 +59,23 @@ class ReleaseCommand(Command):
commits = int(Git("rev-list", base + "..", count=True).firstline()) commits = int(Git("rev-list", base + "..", count=True).firstline())
if commits > 1 and self.confirm( if commits > 1 and self.confirm(
"Desea reemplazar los {commits} commits de la rama por uno solo?" f"¿Desea reemplazar los {commits} commits de la rama por uno solo?",
False
): ):
Git("switch", next_branch, base, create=True).exec( self.info("Debe ingresar el mensaje del commit a crear.")
print="Creando rama release en base"
)
Git("merge", branch, squash=True).exec(
print="Squasheando commits en uno solo"
)
commit_type = self.choice("Tipo de commit", COMMIT_TYPES[:-1]) commit_type = self.choice("Tipo de commit", COMMIT_TYPES[:-1])
commit_message = self.prompt( commit_message = self.prompt(
"Mensaje (máximo recomendado: 100 caracteres)", persistent=True "Mensaje (máximo recomendado: 100 caracteres)", persistent=True
) )
message = commit_type + ": " + commit_message message = commit_type + ": " + commit_message
Git("switch", next_branch, base, create=True).exec(
print="Creando rama release en base"
)
Git("merge", branch, squash=True).exec(
print="Squasheando commits en uno solo"
)
Git("commit", m=message).exec(print="Creando commit único") Git("commit", m=message).exec(print="Creando commit único")
else: else:
Git("switch", next_branch, create=True).exec(print="Creando rama release") Git("switch", next_branch, create=True).exec(print="Creando rama release")