89 lines
2.9 KiB
Python
89 lines
2.9 KiB
Python
from typing import Optional
|
|
|
|
import typer
|
|
|
|
import git_flow.command.base as base
|
|
from git_flow import COMMIT_TYPES, GitFlowError
|
|
from git_flow.git import Git
|
|
|
|
app = typer.Typer()
|
|
|
|
|
|
@app.command()
|
|
def release(group: Optional[str] = None):
|
|
"""Realiza el merge de la rama, o crea el PR para hacerlo si tiene un remoto configurado"""
|
|
base.ensure_initialized()
|
|
|
|
branch = base.ensure_right_branch()
|
|
env, _ = base.get_branch_env_and_type(branch)
|
|
|
|
if env == base.environments[-1]:
|
|
raise GitFlowError(
|
|
"No se puede hacer release de una rama en el ultimo entorno."
|
|
)
|
|
|
|
has_remote = "flow.remote" in base.flowconfig
|
|
|
|
base.ensure_clean_worktree(has_remote)
|
|
|
|
next_env = base.environments[base.environments.index(env) + 1]
|
|
next_branch = (
|
|
branch.replace(f"/{env}/", f"/{next_env}/")
|
|
if branch.startswith("release/")
|
|
else f"release/{next_env}/{branch}"
|
|
)
|
|
|
|
fork_point = Git.get_first_fork_point(branch, env)
|
|
commits = Git("log", fork_point + "..", 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)
|
|
|
|
grouping = group is not None
|
|
|
|
if not group:
|
|
if base.io_confirm("¿Desea agrupar este release con otra rama?", False):
|
|
grouping = True
|
|
group = base.io_choice(
|
|
"Grupo release: ", Git.get_branches("release/" + next_env + "/")
|
|
)
|
|
else:
|
|
group = next_env
|
|
|
|
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")
|
|
|
|
if len(commits) > 1 and base.io_confirm(
|
|
f"¿Desea reemplazar los {len(commits)} commits de la rama por uno solo?", False
|
|
):
|
|
base.io_info("Debe ingresar el mensaje del commit a crear.")
|
|
message = base.get_commit_message(COMMIT_TYPES[:-1])
|
|
|
|
Git("switch", next_branch, fork_point, 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")
|
|
|
|
status = Git("rebase", fork_point, 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"
|
|
)
|