style: run black formatter on merge.py
This commit is contained in:
@@ -87,8 +87,12 @@ def check_merge_conflicts(target: str):
|
||||
Git("merge", abort=True).exec(print="Abortando merge de prueba", check=False)
|
||||
|
||||
if merge_conflicts:
|
||||
base.io_error(f"La rama actual tiene conflictos con {target}.\n"
|
||||
f"Se recomienda mergear {target} a la rama actual, resolver los conflictos localmente, y ejecutar nuevamente este comando", "Conflictos de merge")
|
||||
base.io_error(
|
||||
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.")
|
||||
else:
|
||||
base.io_success("No se detectaron merge conflicts.")
|
||||
@@ -109,7 +113,7 @@ def create_pull_request(token: str, branch: str, target: str):
|
||||
target,
|
||||
title,
|
||||
changelog.generate_content(target, branch),
|
||||
branch not in base.environments
|
||||
branch not in base.environments,
|
||||
)
|
||||
|
||||
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("pull").exec(print="Obteniendo cambios")
|
||||
|
||||
|
||||
def _get_pr_title_from_branch(branch: str) -> str:
|
||||
if branch in base.environments:
|
||||
target = base.environments[base.environments.index(branch) + 1]
|
||||
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_desc = components[-1]
|
||||
|
||||
@@ -136,11 +141,16 @@ def _get_pr_title_from_branch(branch: str) -> str:
|
||||
maybe_ticket = branch_desc[:second_dash]
|
||||
if base.is_valid_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, [
|
||||
f"[Pasaje a {components[1]}]" if len(components) == 4 else None,
|
||||
branch_type + ":",
|
||||
branch_ticket,
|
||||
branch_desc.replace("-", " ")
|
||||
]))
|
||||
return " ".join(
|
||||
filter(
|
||||
None,
|
||||
[
|
||||
f"[Pasaje a {components[1]}]" if len(components) == 4 else None,
|
||||
branch_type + ":",
|
||||
branch_ticket,
|
||||
branch_desc.replace("-", " "),
|
||||
],
|
||||
)
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user