jt/git-flow
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in bugfix/group-release-confirmation-and-commits-squash-count (pull request #40)

Browse Source 
bugfix: group release confirmation and commits squash count

Approved-by: Jonathan Teran
This commit is contained in:
JonathanGitFlow
2025-11-29 16:41:19 +00:00
committed by jt
parent f5e683a1da f1f6e6724c
commit 68e11c66d1
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/git_flow/command/release.py
+11 -8
View File
@@ -45,7 +45,7 @@ class ReleaseCommand(Command):
group = args.group
if not group and self.confirm("¿Desea agrupar este release con otra rama?"):
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
@@ -59,20 +59,23 @@ class ReleaseCommand(Command):
commits = int(Git("rev-list", base + "..", count=True).firstline())
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(
print="Creando rama release en base"
)
Git("merge", branch, squash=True).exec(
print="Squasheando commits en uno solo"
)
self.info("Debe ingresar el mensaje del commit a crear.")
commit_type = self.choice("Tipo de commit", COMMIT_TYPES[:-1])
commit_message = self.prompt(
"Mensaje (máximo recomendado: 100 caracteres)", persistent=True
)
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")
else:
Git("switch", next_branch, create=True).exec(print="Creando rama release")