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

style: run black formatter on merge.py

Browse Source
This commit is contained in:
jt
2026-07-16 22:12:30 -03:00
parent 7315681b23
commit e4833c9ed9
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/git_flow/command/merge.py
+21 -11
View File
@@ -87,8 +87,12 @@ def check_merge_conflicts(target: str):
Git("merge", abort=True).exec(print="Abortando merge de prueba", check=False) Git("merge", abort=True).exec(print="Abortando merge de prueba", check=False)
if merge_conflicts: if merge_conflicts:
base.io_error(f"La rama actual tiene conflictos con {target}.\n" base.io_error(
f"Se recomienda mergear {target} a la rama actual, resolver los conflictos localmente, y ejecutar nuevamente este comando", "Conflictos de merge") f"La rama actual tiene conflictos con {target}.\n"
f"Se recomienda mergear {target} a la rama actual, resolver los conflictos localmente,\n"
"y ejecutar nuevamente este comando",
title = "Conflictos de merge",
)
raise GitFlowError("Ejecución abortada.") raise GitFlowError("Ejecución abortada.")
else: else:
base.io_success("No se detectaron merge conflicts.") base.io_success("No se detectaron merge conflicts.")
@@ -109,7 +113,7 @@ def create_pull_request(token: str, branch: str, target: str):
target, target,
title, title,
changelog.generate_content(target, branch), changelog.generate_content(target, branch),
branch not in base.environments branch not in base.environments,
) )
base.io_success(message, "Rama creada") base.io_success(message, "Rama creada")
@@ -118,12 +122,13 @@ def create_pull_request(token: str, branch: str, target: str):
Git("switch", target).exec(print="Cambiando a rama objetivo") Git("switch", target).exec(print="Cambiando a rama objetivo")
Git("pull").exec(print="Obteniendo cambios") Git("pull").exec(print="Obteniendo cambios")
def _get_pr_title_from_branch(branch: str) -> str: def _get_pr_title_from_branch(branch: str) -> str:
if branch in base.environments: if branch in base.environments:
target = base.environments[base.environments.index(branch) + 1] target = base.environments[base.environments.index(branch) + 1]
return f"Sincronización de entorno {branch} a {target}" return f"Sincronización de entorno {branch} a {target}"
components = branch.split("/") # <type>/<desc> or release/<env>/<type>/<desc> components = branch.split("/") # <type>/<desc> or release/<env>/<type>/<desc>
branch_type = components[-2] branch_type = components[-2]
branch_desc = components[-1] branch_desc = components[-1]
@@ -136,11 +141,16 @@ def _get_pr_title_from_branch(branch: str) -> str:
maybe_ticket = branch_desc[:second_dash] maybe_ticket = branch_desc[:second_dash]
if base.is_valid_ticket(maybe_ticket): if base.is_valid_ticket(maybe_ticket):
branch_ticket = maybe_ticket branch_ticket = maybe_ticket
branch_desc = branch_desc[second_dash+1:] branch_desc = branch_desc[second_dash + 1 :]
return " ".join(filter(None, [ return " ".join(
f"[Pasaje a {components[1]}]" if len(components) == 4 else None, filter(
branch_type + ":", None,
branch_ticket, [
branch_desc.replace("-", " ") f"[Pasaje a {components[1]}]" if len(components) == 4 else None,
])) branch_type + ":",
branch_ticket,
branch_desc.replace("-", " "),
],
)
)