|
|
@@ -16,11 +16,11 @@ app = typer.Typer()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@app.command()
|
|
|
|
@app.command()
|
|
|
|
def tag(token: str | None = None, update_changelog: bool = False):
|
|
|
|
def tag(target: str | None = None, token: str | None = None, update_changelog: bool = False):
|
|
|
|
"""Crea un nuevo tag para el último merge."""
|
|
|
|
"""Crea un nuevo tag para el último merge."""
|
|
|
|
base.ensure_initialized()
|
|
|
|
base.ensure_initialized()
|
|
|
|
|
|
|
|
|
|
|
|
target = Git.get_current_branch()
|
|
|
|
target = target or Git.get_current_branch()
|
|
|
|
|
|
|
|
|
|
|
|
if target not in base.environments:
|
|
|
|
if target not in base.environments:
|
|
|
|
raise GitFlowError("Solo se pueden taggear commits en ramas principales.")
|
|
|
|
raise GitFlowError("Solo se pueden taggear commits en ramas principales.")
|
|
|
@@ -48,7 +48,7 @@ def tag(token: str | None = None, update_changelog: bool = False):
|
|
|
|
current_tag = base.get_remote_api(token).get_latest_tag(suffix)
|
|
|
|
current_tag = base.get_remote_api(token).get_latest_tag(suffix)
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
# Commits se obtienen del último merge, listando hasta el primer forkpoint
|
|
|
|
# Commits se obtienen del último merge, listando hasta el primer forkpoint
|
|
|
|
branch = Git("show", merge_commit + "^2", patch=False, format="%h").firstline()
|
|
|
|
branch = Git("show", merge_commit + "^2", patch=False, format="%H").firstline()
|
|
|
|
fork_point = Git.get_first_fork_point(branch, target)
|
|
|
|
fork_point = Git.get_first_fork_point(branch, target)
|
|
|
|
commits = Git.get_commits(fork_point, branch)
|
|
|
|
commits = Git.get_commits(fork_point, branch)
|
|
|
|
# Último tag se obtiene localmente
|
|
|
|
# Último tag se obtiene localmente
|
|
|
@@ -58,8 +58,6 @@ def tag(token: str | None = None, update_changelog: bool = False):
|
|
|
|
[c.subject for c in commits], suffix, current_tag
|
|
|
|
[c.subject for c in commits], suffix, current_tag
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
base.io_info(f"Current tag: {current_tag}. Next tag: {next_tag}")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if not next_tag:
|
|
|
|
if not next_tag:
|
|
|
|
base.io_warning(
|
|
|
|
base.io_warning(
|
|
|
|
"Los cambios realizados no implican un salto de versión, se mantiene la anterior."
|
|
|
|
"Los cambios realizados no implican un salto de versión, se mantiene la anterior."
|
|
|
@@ -76,7 +74,7 @@ def tag(token: str | None = None, update_changelog: bool = False):
|
|
|
|
if ci:
|
|
|
|
if ci:
|
|
|
|
Git("push").exec()
|
|
|
|
Git("push").exec()
|
|
|
|
|
|
|
|
|
|
|
|
tag_commit = Git("show", "HEAD", patch=False, format="%h").firstline()
|
|
|
|
tag_commit = Git("show", "HEAD", patch=False, format="%H").firstline()
|
|
|
|
|
|
|
|
|
|
|
|
if ci:
|
|
|
|
if ci:
|
|
|
|
base.io_success(base.get_remote_api(token).create_tag(next_tag, tag_commit))
|
|
|
|
base.io_success(base.get_remote_api(token).create_tag(next_tag, tag_commit))
|
|
|
|