Compare commits

...
66 Commits
Author SHA1 Message Date
jt 83dc348fff Merge pull request 'docs: cleanup pipeline steps' (#57) from docs/update-readme into main
Publish to PyPI / Bump-Build-Publish (push) Failing after 8s
Reviewed-on: #57
2026-09-21 19:24:23 +00:00
jt 5f65df64e4 docs: cleanup pipeline steps 2026-09-21 16:24:04 -03:00
jt e4a633e2e2 Merge pull request 'docs: update readme to reflect new tag command' (#56) from docs/update-readme into main
Publish to PyPI / Bump-Build-Publish (push) Failing after 22s
Reviewed-on: #56
2026-09-21 19:22:21 +00:00
jt ae81260e38 docs: update readme to reflect new tag command 2026-09-21 16:22:01 -03:00
jt 04c05ca8ce Merge pull request 'bugfix: check if merge commit already has a tag before tagging' (#55) from bugfix/check-merge-commit-tag into main
Publish to PyPI / Bump-Build-Publish (push) Successful in 18s
Reviewed-on: #55
2026-09-21 18:12:13 +00:00
jt 0d1ce5305b bugfix: check if merge commit already has a tag before tagging 2026-09-21 15:11:47 -03:00
jt a17d9c308a Merge pull request 'bugfix: get target from tag options' (#54) from bugfix/clean-tag-command into main
Publish to PyPI / Bump-Build-Publish (push) Successful in 19s
Reviewed-on: #54
2026-09-21 17:35:49 +00:00
jt 7121d40ed8 bugfix: get target from tag options 2026-09-21 14:35:27 -03:00
jt 41b7a9e602 Merge pull request 'bugfix: use full commit sha' (#53) from bugfix/clean-tag-command into main
Publish to PyPI / Bump-Build-Publish (push) Successful in 18s
Reviewed-on: #53
2026-09-21 17:18:57 +00:00
jt f35dbc126a bugfix: use full commit sha 2026-09-21 14:17:43 -03:00
jt 410c5f9356 Merge pull request 'bugfix: remove debug log' (#52) from bugfix/clean-tag-command into main
Publish to PyPI / Bump-Build-Publish (push) Successful in 19s
Reviewed-on: #52
2026-09-21 16:54:35 +00:00
jt 7a24ccb24c bugfix: remove debug log 2026-09-21 13:49:50 -03:00
gitea-actions dc35b635a1 chore: bump version and update CHANGELOG.md [skip ci] 2026-09-21 16:46:23 +00:00
jt 5171100c76 Merge pull request 'feature: add fetch depth' (#51) from feature/prevent-changelog-update into main
Publish to PyPI / Bump-Build-Publish (push) Successful in 19s
Reviewed-on: #51
2026-09-21 16:46:06 +00:00
jt 68cec91506 feature: add fetch depth 2026-09-21 13:45:50 -03:00
jt 02c081f68f Merge pull request 'feature: add debug info' (#50) from feature/prevent-changelog-update into main
Publish to PyPI / Bump-Build-Publish (push) Failing after 16s
Reviewed-on: #50
2026-09-21 16:42:18 +00:00
jt a83d693584 feature: add debug info 2026-09-21 13:41:59 -03:00
jt b51544ddab Merge pull request 'feature: show errors on ci' (#49) from feature/prevent-changelog-update into main
Publish to PyPI / Bump-Build-Publish (push) Failing after 16s
Reviewed-on: #49
2026-09-21 16:40:30 +00:00
jt d5a88d6c8d feature: show errors on ci 2026-09-21 13:40:11 -03:00
jt e144048429 Merge pull request 'feature: remove file parameter on status report' (#48) from feature/prevent-changelog-update into main
Publish to PyPI / Bump-Build-Publish (push) Failing after 16s
Reviewed-on: #48
2026-09-21 16:37:23 +00:00
jt d7f2e569da feature: remove file parameter on status report 2026-09-21 13:37:05 -03:00
jt 45fe22aea7 Merge pull request 'feature: add debug info' (#47) from feature/prevent-changelog-update into main
Publish to PyPI / Bump-Build-Publish (push) Failing after 17s
Reviewed-on: #47
2026-09-21 16:30:53 +00:00
jt c194b555c3 feature: add debug info 2026-09-21 13:29:58 -03:00
jt 60c29b6aa5 Merge pull request 'feature: install uv before bump, run using uv' (#46) from feature/prevent-changelog-update into main
Publish to PyPI / Bump-Build-Publish (push) Failing after 25s
Reviewed-on: #46
2026-09-21 16:26:26 +00:00
jt 488e9172cb feature: remove condition from install uv step 2026-09-21 13:23:31 -03:00
jt c23a890f8e Merge pull request 'feature: install uv before bump, run using uv' (#45) from feature/prevent-changelog-update into main
Publish to PyPI / Bump-Build-Publish (push) Failing after 16s
Reviewed-on: #45
2026-09-21 16:22:33 +00:00
jt dd79b478e2 feature: install uv before bump, run using uv 2026-09-21 12:28:38 -03:00
jt 0a143909f5 Merge pull request 'feature: add uv install step' (#44) from feature/prevent-changelog-update into main
Publish to PyPI / Bump-Build-Publish (push) Failing after 24s
Reviewed-on: #44
2026-09-21 15:26:28 +00:00
jt 6a44b20556 feature: add uv install step 2026-09-21 12:26:11 -03:00
jt cc816b4244 Merge pull request 'feature: use command status to skip next job' (#43) from feature/prevent-changelog-update into main
Publish to PyPI / Bump-Build-Publish (push) Failing after 9s
Reviewed-on: #43
2026-09-21 15:24:10 +00:00
jt 8ff91e9c45 feature: use command status to skip next job 2026-09-21 12:23:49 -03:00
jt 865c39e4f2 Merge pull request 'bugfix: show error when no next tag availbale' (#41) from feature/prevent-changelog-update into main
Publish to PyPI / Bump-Build-Publish (push) Successful in 9s
Reviewed-on: #41
2026-09-21 15:13:42 +00:00
jt f14c77e144 bugfix: show error when no next tag availbale 2026-09-21 12:13:18 -03:00
jt 01631cfddd Merge pull request 'feature: dont update changelog by default' (#40) from feature/prevent-changelog-update into main
Publish to PyPI / Bump-Build-Publish (push) Successful in 9s
Reviewed-on: #40
2026-09-21 14:29:46 +00:00
jt ad76e13673 feature: dont update changelog by default 2026-09-21 11:28:28 -03:00
jt d054881f3e Merge pull request 'docs: add output to version step' (#38) from chore/update-workflow into main
Publish to PyPI / Bump-Build-Publish (push) Successful in 8s
Reviewed-on: #38
2026-09-21 14:08:37 +00:00
jt ab3023acb7 docs: add output to version step 2026-09-21 11:08:22 -03:00
jt aa63815cc6 Merge pull request 'docs: fix workflow syntax' (#37) from chore/update-workflow into main
Publish to PyPI / Bump-Build-Publish (push) Successful in 8s
Reviewed-on: #37
2026-09-21 14:06:56 +00:00
jt 9ef3100871 docs: fix workflow syntax 2026-09-21 11:06:38 -03:00
jt 201e2b54a6 Merge pull request 'docs: add condition checking before build and publish' (#36) from chore/update-workflow into main
Publish to PyPI / Bump-Build-Publish (push) Failing after 8s
Reviewed-on: #36
2026-09-21 14:05:48 +00:00
jt a5e50b8b16 docs: add condition checking before build and publish 2026-09-21 11:05:28 -03:00
jt df09810806 Merge pull request 'docs: update workflow' (#35) from chore/update-workflow into main
Publish to PyPI / Publish-to-PyPI (push) Failing after 7s
Reviewed-on: #35
2026-09-21 14:00:31 +00:00
Jonathan Teran Carballo e44cd98696 docs: update workflow 2026-09-21 11:00:14 -03:00
gitea-actions 57c6ff7a4b chore: bump version and update CHANGELOG.md [skip ci] 2026-09-21 13:57:25 +00:00
jt 4a39fe95d4 Merge pull request 'bugfix: tag locally for workflow to run' (#33) from bugfix/return-empty-on-remote-tag-error into main
Publish to PyPI / Publish-to-PyPI (push) Successful in 19s
Reviewed-on: #33
2026-09-21 13:57:08 +00:00
Jonathan Teran Carballo 24a40c99bc bugfix: tag locally for workflow to run 2026-09-21 10:56:42 -03:00
gitea-actions bd03cf218b chore: bump version and update CHANGELOG.md [skip ci] 2026-09-21 13:54:46 +00:00
jt e9e7d2ad6e Merge pull request 'bugfix: fix workflow pipeline' (#32) from bugfix/return-empty-on-remote-tag-error into main
Publish to PyPI / Publish-to-PyPI (push) Failing after 20s
Reviewed-on: #32
2026-09-21 13:54:33 +00:00
Jonathan Teran Carballo 82c78c727a bugfix: fix workflow pipeline 2026-09-21 10:54:16 -03:00
jt 6d65462dbf Merge pull request 'bugfix: return empty on remote tag error' (#28) from bugfix/return-empty-on-remote-tag-error into main
Publish to PyPI / Publish-to-PyPI (push) Failing after 8s
Reviewed-on: #28
2026-09-21 13:45:48 +00:00
Jonathan Teran Carballo 6df7206eec bugfix: print errors in stderr 2026-09-21 10:45:16 -03:00
Jonathan Teran Carballo e793feaa1e bugfix: only return tag on remote tag command, empty if error 2026-09-21 10:44:48 -03:00
jt d03cf964e1 Merge pull request 'docs: fix workflow yaml' (#27) from chore/update-pipeline into main
Publish to PyPI / Publish-to-PyPI (push) Failing after 12s
Reviewed-on: #27
2026-09-21 12:53:52 +00:00
Jonathan Teran Carballo 9d17cf0320 docs: fix workflow yaml 2026-09-21 09:53:28 -03:00
jt 8c95835207 Merge pull request 'docs: update pipeline workflow' (#26) from chore/update-pipeline into main
Publish to PyPI / Publish-to-PyPI (push) Failing after 0s
Reviewed-on: #26
2026-09-21 12:49:27 +00:00
Jonathan Teran Carballo 7c69936360 docs: update pipeline workflow 2026-09-21 09:48:01 -03:00
gitea-actions 4cf6321b80 chore: bump version and update CHANGELOG.md [skip ci] 2026-09-21 12:45:33 +00:00
jt ae61fa4fa4 Merge pull request 'refactor: update remote tag fetching behaviour so it uses api instead of shallow clone' (#25) from refactor/remote-tag-fetching-behaviour into main
Publish to PyPI / Publish-to-PyPI (push) Successful in 37s
Reviewed-on: #25
2026-09-21 12:45:04 +00:00
Jonathan Teran Carballo 22ba8f5e5f refactor: update remote tag fetching behaviour so it uses api instead of shallow clone 2026-09-21 09:15:48 -03:00
gitea-actions eabef5eb33 chore: bump version and update CHANGELOG.md [skip ci] 2026-09-21 00:12:35 +00:00
jt ff61238bfe Merge pull request 'feature: tag remote fetch commits from api' (#24) from feature/tag-remote-fetch-commits-from-api into main
Publish to PyPI / Publish-to-PyPI (push) Successful in 41s
Reviewed-on: #24
2026-09-21 00:11:58 +00:00
Jonathan Teran Carballo c50688bb1a bugfix: fix parameters for changelog generate_content 2026-09-20 21:08:12 -03:00
Jonathan Teran Carballo 26ab81b175 feature: tag from ci fetches commits from remote api 2026-09-20 21:05:21 -03:00
gitea-actions 889109bf77 chore: bump version and update CHANGELOG.md [skip ci] 2026-09-18 14:27:33 +00:00
jt 164eded8f8 Merge pull request 'bugfix: muevo titulo de error al panel, agrego repositorio a gitlab error' (#23) from bugfix/add-debug-error-info-2 into main
Publish to PyPI / Publish-to-PyPI (push) Successful in 18s
Reviewed-on: #23
2026-09-18 14:27:19 +00:00
Jonathan Teran ce1ab99ddc bugfix: muevo titulo de error al panel, agrego repositorio a gitlab error 2026-09-18 11:26:55 -03:00
15 changed files with 434 additions and 124 deletions
+43
View File
@@ -0,0 +1,43 @@
name: Publish to PyPI
on:
push:
branches:
- main
jobs:
Bump-Build-Publish:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v7
with:
fetch-depth: 10
- name: Set up Python
uses: actions/setup-python@v6
with:
python-version-file: ".python-version"
- name: Install git-flow and bump version
id: version
run: |
pip install git-flow-envs=="${{ vars.GITFLOWENVS_VERSION }}"
git-flow tag --token="${{ secrets.GITEA_TOKEN }}"
RESULT="$?"
if [ "$RESULT" -eq 0 ]; then
echo "New tag available."
echo "should_build=true" >> $GITHUB_OUTPUT
else
echo "No new tag available, skipping next step."
echo "should_build=false" >> $GITHUB_OUTPUT
fi
- name: Install uv
uses: astral-sh/setup-uv@v8.3.2
- name: Build and publish
if: steps.version.outputs.should_build == 'true'
run: |
uv build
uv publish --token="${{ secrets.PYPI_TOKEN }}"
-37
View File
@@ -1,37 +0,0 @@
name: Publish to PyPI
on:
push:
branches:
- main
jobs:
Publish-to-PyPI:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v7
with:
fetch-depth: 0
- name: Configure git
run: |
git config --global user.name "gitea-actions"
git config --global user.email "actions@git.jonathanteran.dev"
git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: "Set up Python"
uses: actions/setup-python@v6
with:
python-version-file: ".python-version"
- name: Install uv
uses: astral-sh/setup-uv@v8.3.2
- name: Bump version
run: |
uv run git-flow tag --token="${{ secrets.GITEA_TOKEN }}"
- name: Build and publish
run: |
uv build
uv publish --token="${{ secrets.PYPI_TOKEN }}"
+43
View File
@@ -1,3 +1,46 @@
## v1.23.0 - 2026-09-21
- **feature**: add fetch depth [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (68cec91)
---
## v1.22.3 - 2026-09-21
- **bugfix**: tag locally for workflow to run [[jteran](mailto:jteran@renatre.org.ar)] (24a40c9)
---
## v1.22.2 - 2026-09-21
- **bugfix**: fix workflow pipeline [[jteran](mailto:jteran@renatre.org.ar)] (82c78c7)
---
## v1.22.1 - 2026-09-21
- **refactor**: update remote tag fetching behaviour so it uses api instead of shallow clone [[jteran](mailto:jteran@renatre.org.ar)] (22ba8f5)
---
## v1.22.0 - 2026-09-21
- **feature**: tag from ci fetches commits from remote api [[jteran](mailto:jteran@renatre.org.ar)] (26ab81b)
- **bugfix**: fix parameters for changelog generate_content [[jteran](mailto:jteran@renatre.org.ar)] (c50688b)
---
## v1.21.3 - 2026-09-18
- **bugfix**: muevo titulo de error al panel, agrego repositorio a gitlab error [[jteran](mailto:jteran@renatre.org.ar)] (ce1ab99)
---
## v1.21.2 - 2026-09-18
- **bugfix**: agrego informacion de traceback para errores de GitFlow [[jteran](mailto:jteran@renatre.org.ar)] (8a4cf6e)
+22 -1
View File
@@ -67,7 +67,7 @@ más información):
- `new`: Crea una nueva rama siguiendo CB.
- `commit`: Crea un commit siguiendo CC.
- `merge`: Mergea la rama actual a una de las ramas principales.
- `tag`: Crea un tag sobre el ultimo merge siguiendo SemVer.
- `tag`: Crea un tag sobre el ultimo merge siguiendo SemVer (ver [Tag](#tag)).
- `release`: Prepara la rama actual para pasarse al siguiente entorno configurado.
- `branch`: Lista las ramas del repositorio, agrupadas por entorno objetivo.
@@ -91,6 +91,27 @@ El workflow para el cual se penso la herramienta es el siguiente:
En cualquier momento se puede usar `git-flow branch` para ver en qué entorno está cada rama, y cuáles
están todavía en progreso (`wip/`) o descartadas (`trash/`).
### Tag
`git-flow tag [--target=<RAMA>] [--token=<TOKEN>] [--update-changelog]`
- `--target`: rama principal sobre la que se taggea. Por defecto, la rama actual. Debe ser una de las
ramas principales configuradas.
- `--token`: Access Token del remoto. Si se pasa, se asume que corre en un pipeline: los commits y el
último tag se obtienen por API del remoto y el tag se crea en el remoto (y también localmente). Si
no, se usa `.repository-token` y todo se resuelve localmente.
- `--update-changelog`: genera la entrada correspondiente en `CHANGELOG.md` y la commitea antes de
taggear (en un pipeline, además hace push del commit).
Comportamiento:
- El tag se crea sobre el último merge (first-parent) de la rama. Si ese merge ya tiene un tag, no se
hace nada.
- La versión se calcula a partir de los tipos de commit (CC) del último merge. Si ningún commit
implica un salto de versión, se avisa y el comando termina con código de salida 1.
- Con más de un entorno configurado, cada rama versiona por separado con el nombre del entorno como
sufijo (por ejemplo, `v1.2.0-prod`). Con un solo entorno no se agrega sufijo.
## Remotos soportados
Cada remoto necesita un Access Token con permisos para crear Pull/Merge Requests y tags. El token se
+10 -13
View File
@@ -1,15 +1,15 @@
from datetime import datetime
from os.path import isfile
from git_flow.git import Git
from git_flow.git import Commit
class Changelog:
FILENAME = "CHANGELOG.md"
COMMIT_MESSAGE = "chore: bump version and update CHANGELOG.md [skip ci]"
def update(self, title: str, base: str, branch: str):
self._prepend(self.generate_entry(title, base, branch))
def update(self, title: str, commits: list[Commit]):
self._prepend(self.generate_entry(title, commits))
def generate_header(self, title):
now = datetime.now()
@@ -18,16 +18,13 @@ class Changelog:
"""
def generate_content(self, base: str, branch: str):
commits = Git(
"log", base + ".." + branch, first_parent=True, format="%h", merges=False
).lines()
def generate_content(self, commits: list[Commit]):
content = ""
for commit in commits:
message = Git("show", commit, patch=False, format="%s").firstline()
email = Git("show", commit, patch=False, format="%ae").firstline()
username = email[: email.index("@")]
message = commit.subject
email = commit.email
username = email[: email.index("@")] if "@" in email else email
description = message
if ":" in message:
@@ -36,7 +33,7 @@ class Changelog:
commit_message = message[index + 1 :]
description = f"**{commit_type}**: {commit_message}"
content += f"- {description} [[{username}](mailto:{email})] ({commit})\n"
content += f"- {description} [[{username}](mailto:{email})] ({commit.sha})\n"
return content
@@ -47,10 +44,10 @@ class Changelog:
"""
def generate_entry(self, title: str, base: str, branch: str):
def generate_entry(self, title: str, commits: list[Commit]):
return (
self.generate_header(title)
+ self.generate_content(base, branch)
+ self.generate_content(commits)
+ self.generate_footer()
)
+16 -16
View File
@@ -1,24 +1,24 @@
from os.path import isfile
import questionary
import rich
import rich.panel
from git_flow import (
BRANCH_TYPES,
REPOSITORY_TOKEN_FILENAME,
COMMIT_TYPES,
FLOWCONFIG_FILENAME,
FLOWCONFIG_VERSION,
COMMIT_TYPES,
REPOSITORY_TOKEN_FILENAME,
GitFlowError,
)
from git_flow.git import Git
from git_flow.io import *
from git_flow.remote.base import RemoteAPI
from git_flow.remote.bitbucket import BitbucketRemoteAPI
from git_flow.remote.github import GithubRemoteAPI
from git_flow.remote.gitea import GiteaRemoteAPI
from git_flow.remote.github import GithubRemoteAPI
from git_flow.remote.gitlab import GitlabRemoteAPI
from git_flow.io import *
from os.path import isfile
from typing import Optional
import rich
import rich.panel
import questionary
flowconfig = Git.get_config(FLOWCONFIG_FILENAME) if isfile(FLOWCONFIG_FILENAME) else {}
environments = (
@@ -102,7 +102,7 @@ def ensure_clean_worktree(has_remote: bool):
if not status:
return
not_empty = any(map(lambda s: s.index != " " or s.worktree != " ", status))
not_empty = any(s.index != " " or s.worktree != " " for s in status)
if not_empty:
if not has_remote:
@@ -162,23 +162,23 @@ def get_commit_message(commit_types: list[str] = COMMIT_TYPES) -> str:
return commit_type + ": " + commit_message
def io_error(message: str, title: Optional[str] = None):
def io_error(message: str, title: str | None = None):
_io_status(message, "✖ Error: ", "red", title)
def io_warning(message: str, title: Optional[str] = None):
def io_warning(message: str, title: str | None = None):
_io_status(message, "⚠ Warning: ", "yellow", title)
def io_info(message: str, title: Optional[str] = None):
def io_info(message: str, title: str | None = None):
_io_status(message, "ℹ Info: ", "blue", title)
def io_success(message: str, title: Optional[str] = None):
def io_success(message: str, title: str | None = None):
_io_status(message, "✔ Success: ", "green", title)
def _io_status(message: str, prefix: str, style: str, title: Optional[str] = None):
def _io_status(message: str, prefix: str, style: str, title: str | None = None):
if title:
rich.print(
rich.panel.Panel(
+2 -1
View File
@@ -111,11 +111,12 @@ def create_pull_request(token: str, branch: str, target: str):
if base.io_confirm("¿Desea cambiar el título del PR?", False):
title = base.io_prompt("Título del PR", persistent=True)
commits = Git.get_commits(target, branch)
message = base.get_remote_api(token).create_pull_request(
branch,
target,
title,
changelog.generate_content(target, branch),
changelog.generate_content(commits),
branch not in base.environments,
)
+65 -52
View File
@@ -1,8 +1,5 @@
from typing import Optional
import typer
import git_flow.command.base as base
from git_flow import (
COMMIT_TYPE_INCREMENT,
SEMVER_MAJOR,
@@ -12,89 +9,107 @@ from git_flow import (
GitFlowError,
)
from git_flow.changelog import Changelog
from git_flow.command import base
from git_flow.git import Git
app = typer.Typer()
@app.command()
def tag(token: Optional[str] = None):
def tag(target: str | None = None, token: str | None = None, update_changelog: bool = False):
"""Crea un nuevo tag para el último merge."""
base.ensure_initialized()
target = Git.get_current_branch()
target = target or Git.get_current_branch()
if target not in base.environments:
raise GitFlowError("Solo se pueden taggear commits en ramas principales.")
branch = Git(
"show", get_last_merge_commit() + "^2", patch=False, format="%h"
merge_commit = Git(
"log", first_parent=True, merges=True, max_count=1, format="%H"
).firstline()
fork_point = Git.get_first_fork_point(branch, target)
commits = Git("log", fork_point + ".." + branch, format="%s").lines()
next_tag = get_next_tag_from_commits(commits, target)
if not next_tag:
base.io_info(
"Los cambios realizados no implican un salto de versión, se mantiene la anterior."
)
if not merge_commit:
raise GitFlowError("No hay merges a taggear.")
merge_commit_tag = Git("tag", "--points-at", merge_commit).firstline()
if merge_commit_tag:
base.io_info(f"El último merge ya tiene un tag: {merge_commit_tag}")
return
# Con varios entornos cada uno versiona por separado (v1.0.0-prod), con uno solo no hace falta
suffix = f"-{target}" if len(base.environments) > 1 else ""
token, ci = get_token_and_ci(token)
if not token:
if ci and not token:
raise GitFlowError("No hay token disponible")
changelog = Changelog()
# Con varios entornos cada uno versiona por separado (v1.0.0-prod), con uno solo no hace falta
suffix = f"-{target}" if len(base.environments) > 1 else ""
changelog.update(next_tag, fork_point, branch)
Git("add", Changelog.FILENAME).exec(print="Agregando nuevo CHANGELOG.md")
Git("commit", message=Changelog.COMMIT_MESSAGE).exec(print="Creando commit")
tag_commit = Git("show", "HEAD", patch=False, format="%h").firstline()
if ci:
# Commits se obtienen por API del ultimo PR / MR mergeado
commits = base.get_remote_api(token).get_merge_commits(merge_commit)
commits = [c for c in commits if not c.is_merge]
# Último tag se obtiene por API filtrando por sufijo
current_tag = base.get_remote_api(token).get_latest_tag(suffix)
else:
# Commits se obtienen del último merge, listando hasta el primer forkpoint
branch = Git("show", merge_commit + "^2", patch=False, format="%H").firstline()
fork_point = Git.get_first_fork_point(branch, target)
commits = Git.get_commits(fork_point, branch)
# Último tag se obtiene localmente
current_tag = Git.get_current_tag(suffix)
next_tag = get_next_tag_from_commits(
[c.subject for c in commits], suffix, current_tag
)
if not next_tag:
base.io_warning(
"Los cambios realizados no implican un salto de versión, se mantiene la anterior."
)
raise typer.Exit(code=1)
if update_changelog:
changelog = Changelog()
changelog.update(next_tag, commits)
Git("add", Changelog.FILENAME).exec(print="Agregando nuevo CHANGELOG.md")
Git("commit", message=Changelog.COMMIT_MESSAGE).exec(print="Creando commit")
if ci:
Git("push").exec()
tag_commit = Git("show", "HEAD", patch=False, format="%H").firstline()
if ci:
Git("push").exec(print="Subiendo commit al remoto para taggearlo")
base.io_success(base.get_remote_api(token).create_tag(next_tag, tag_commit))
Git("tag", next_tag, tag_commit).exec(print="Creando tag localmente")
def get_token_and_ci(token: Optional[str]):
try:
return (base.ensure_repository_token(), False)
except GitFlowError:
def get_token_and_ci(token: str | None):
if token:
return (token, True)
else:
return (base.ensure_repository_token(), False)
def get_last_merge_commit():
commit = Git(
"log", first_parent=True, merges=True, max_count=1, format="%h"
).firstline()
if not commit:
raise GitFlowError("No hay merges a taggear.")
return commit
def check_not_tagged(commit: str):
tag = Git("describe", commit, tags=True, exact_match=True).firstline(check=False)
if tag:
raise GitFlowError("El commit a taggear ya tiene tag: " + tag)
def get_next_tag_from_commits(commits: list[str], branch: str) -> str | None:
def get_next_tag_from_commits(
commits: list[str], suffix: str, current_tag: str | None
) -> str | None:
increment = SEMVER_SKIP
for commit in commits:
commit_type = commit[: commit.index(":")]
commit_type = commit.partition(":")[0]
increment = max(increment, COMMIT_TYPE_INCREMENT.get(commit_type, SEMVER_SKIP))
tag = Git.get_current_tag() or f"v0.0.0-{branch}"
if increment == SEMVER_SKIP:
return None
until_dash = tag.index("-") if "-" in tag else None
suffix = tag[until_dash:] if until_dash is not None else ""
[major, minor, patch] = map(int, tag[1:until_dash].split("."))
version = (current_tag or "v0.0.0" + suffix).removeprefix("v").removesuffix(suffix)
[major, minor, patch] = map(int, version.split("."))
if increment == SEMVER_MAJOR:
major += 1
@@ -105,7 +120,5 @@ def get_next_tag_from_commits(commits: list[str], branch: str) -> str | None:
patch = 0
elif increment == SEMVER_PATCH:
patch += 1
elif increment == SEMVER_SKIP:
suffix = "-r" + Git("rev-list", "HEAD", count=True).firstline()
return None if increment == SEMVER_SKIP else f"v{major}.{minor}.{patch}{suffix}"
return f"v{major}.{minor}.{patch}{suffix}"
+34 -2
View File
@@ -1,9 +1,20 @@
import subprocess
from dataclasses import dataclass
from git_flow import FLOWCONFIG_FILENAME
from git_flow.io import *
@dataclass
class Commit:
"""Datos de un commit necesarios para versionar y generar el changelog."""
sha: str
subject: str
email: str
is_merge: bool = False
class Git:
class Status:
worktree: str
@@ -52,8 +63,15 @@ class Git:
return list(map(Git.Status, Git("status", porcelain=True).lines(False)))
@staticmethod
def get_current_tag():
return Git("describe", abbrev="0", tags=True).firstline(check=False, print="Obteniendo tag actual")
def get_current_tag(suffix: str = ""):
"""Último tag SemVer alcanzable desde HEAD, con el sufijo exacto indicado."""
return Git(
"describe",
abbrev="0",
tags=True,
match="v[0-9]*.[0-9]*.[0-9]*" + suffix,
exclude=None if suffix else "*-*",
).firstline(check=False, print="Obteniendo tag actual")
@staticmethod
def get_first_fork_point(branch: str, env: str):
@@ -65,6 +83,20 @@ class Git:
return Git("show", env_commits[-1] + "^", patch=False, format="%h").firstline()
@staticmethod
def get_commits(base: str, branch: str) -> list[Commit]:
"""Commits propios de la rama (sin merges), del más nuevo al más viejo."""
lines = Git(
"log", base + ".." + branch, first_parent=True, merges=False, format="%h%x09%ae%x09%s"
).lines()
commits = []
for line in lines:
[sha, email, subject] = line.split("\t", 2)
commits.append(Commit(sha, subject, email))
return commits
@staticmethod
def _get_references(kind: str):
prefix = "refs/" + kind
+3 -1
View File
@@ -27,7 +27,9 @@ def main():
app()
print()
except GitFlowError as e:
base.io_error("".join(traceback.format_exception(e)), title="Git Flow: " + str(e))
lines = [str(e), ""]
lines += traceback.format_exception(e)
base.io_error("".join(lines), title="Git Flow")
except SubprocessError as e:
base.io_error(str(e), title="Comando")
except KeyboardInterrupt:
+58 -1
View File
@@ -1,9 +1,12 @@
from abc import ABC, abstractmethod
import re
import giturlparse
import requests
from git_flow import SUPPORTED_REMOTE_URL_SCHEMAS, GitFlowError
from git_flow.git import Git
from git_flow.git import Commit, Git
class RemoteAPI(ABC):
@@ -65,6 +68,18 @@ class RemoteAPI(ABC):
def create_tag(self, tag: str, commit: str) -> str:
pass
@abstractmethod
def get_merge_commits(self, merge_commit: str) -> list[Commit]:
"""Busca el PR que generó el merge commit y devuelve sus commits (del más nuevo al más
viejo), sin depender del historial local."""
pass
@abstractmethod
def list_tags(self, suffix: str = "") -> list[str]:
"""Nombres de los tags del repositorio, sin orden garantizado. `suffix` es solo una pista
para que la API filtre; el filtrado definitivo se hace en `get_latest_tag`."""
pass
@abstractmethod
def get_endpoint(self, resource: str) -> str:
pass
@@ -75,3 +90,45 @@ class RemoteAPI(ABC):
"Content-Type": "application/json",
"Authorization": "Bearer " + self.token,
}
def get_json(self, url: str, params: dict | None = None):
response = requests.get(url, headers=self.get_headers(), params=params)
if not response.ok:
raise GitFlowError(f"Ocurrió un error al consultar {url}: {response.text}")
return response
def get_latest_tag(self, suffix: str = "") -> str | None:
"""Tag SemVer más alto (vX.Y.Z + suffix exacto), o None si no hay ninguno."""
pattern = re.compile(rf"^v(\d+)\.(\d+)\.(\d+){re.escape(suffix)}$")
versions = {}
for name in self.list_tags(suffix):
match = pattern.match(name)
if match:
versions[tuple(map(int, match.groups()))] = name
return versions[max(versions)] if versions else None
def get_all_pages(
self,
url: str,
page_size: int = 50,
params: dict | None = None,
size_param: str = "per_page",
) -> list:
"""Recorre un endpoint paginado por número de página (page / per_page)."""
items: list = []
page = 1
while True:
query = {**(params or {}), "page": page, size_param: page_size}
batch = self.get_json(url, query).json()
items += batch
if len(batch) < page_size:
return items
page += 1
+49
View File
@@ -1,5 +1,8 @@
import re
import requests
from git_flow import GitFlowError
from git_flow.git import Commit
from git_flow.remote.base import RemoteAPI
@@ -44,5 +47,51 @@ class BitbucketRemoteAPI(RemoteAPI):
else:
raise GitFlowError("Ocurrió un error al crear el tag: " + response.text)
def get_merge_commits(self, merge_commit: str) -> list[Commit]:
prs = self.get_json(self.get_endpoint(f"commit/{merge_commit}/pullrequests")).json()
pr = next((p for p in prs["values"] if p["state"] == "MERGED"), None)
if not pr:
raise GitFlowError(f"No se encontró un PR para el commit {merge_commit}")
commits: list[Commit] = []
url: str | None = self.get_endpoint(f"pullrequests/{pr['id']}/commits")
# Bitbucket pagina siguiendo el link "next", y devuelve del más nuevo al más viejo
while url:
page = self.get_json(url).json()
for c in page["values"]:
raw = c["author"].get("raw", "")
match = re.search(r"<(.+?)>", raw)
commits.append(
Commit(
c["hash"][:7],
c["message"].splitlines()[0],
match.group(1) if match else raw,
len(c["parents"]) > 1,
)
)
url = page.get("next")
return commits
def list_tags(self, suffix: str = "") -> list[str]:
names: list[str] = []
url: str | None = self.get_endpoint("refs/tags")
params: dict[str, int|str] | None = {"pagelen": 100}
if suffix:
params["q"] = f'name ~ "{suffix}"'
while url:
page = self.get_json(url, params).json()
names += [t["name"] for t in page["values"]]
url = page.get("next")
params = None # "next" ya incluye la query
return names
def get_endpoint(self, resource: str) -> str:
return f"{BitbucketRemoteAPI.API_ENDPOINT}/{self.repository}/{resource}"
+35
View File
@@ -1,5 +1,6 @@
import requests
from git_flow import GitFlowError
from git_flow.git import Commit
from git_flow.remote.base import RemoteAPI
@@ -44,6 +45,40 @@ class GiteaRemoteAPI(RemoteAPI):
else:
raise GitFlowError("Ocurrió un error al crear el tag: " + response.text)
def get_merge_commits(self, merge_commit: str) -> list[Commit]:
pr = self.get_json(self.get_endpoint(f"/commits/{merge_commit}/pull")).json()
url = self.get_endpoint(f"/pulls/{pr['number']}/commits")
items: list = []
page = 1
# Gitea pagina con page / limit
while True:
batch = self.get_json(
url, {"page": page, "limit": 50, "files": "false", "verification": "false"}
).json()
items += batch
if len(batch) < 50:
break
page += 1
# La API los devuelve del más viejo al más nuevo
return [
Commit(
c["sha"][:7],
c["commit"]["message"].splitlines()[0],
c["commit"]["author"]["email"],
len(c["parents"]) > 1,
)
for c in reversed(items)
]
def list_tags(self, suffix: str = "") -> list[str]:
tags = self.get_all_pages(self.get_endpoint("/tags"), 50, size_param="limit")
return [t["name"] for t in tags]
def get_endpoint(self, resource: str) -> str:
return f"{self.base_url}/api/v1/repos/{self.repository}{resource}"
+24
View File
@@ -1,5 +1,6 @@
import requests
from git_flow import GitFlowError
from git_flow.git import Commit
from git_flow.remote.base import RemoteAPI
@@ -42,5 +43,28 @@ class GithubRemoteAPI(RemoteAPI):
else:
raise GitFlowError("Ocurrió un error al crear el tag: " + response.text)
def get_merge_commits(self, merge_commit: str) -> list[Commit]:
prs = self.get_json(self.get_endpoint(f"/commits/{merge_commit}/pulls")).json()
pr = next((p for p in prs if p.get("merge_commit_sha") == merge_commit), None)
if not pr:
raise GitFlowError(f"No se encontró un PR para el commit {merge_commit}")
items = self.get_all_pages(self.get_endpoint(f"/pulls/{pr['number']}/commits"), 100)
# La API los devuelve del más viejo al más nuevo
return [
Commit(
c["sha"][:7],
c["commit"]["message"].splitlines()[0],
c["commit"]["author"]["email"],
len(c["parents"]) > 1,
)
for c in reversed(items)
]
def list_tags(self, suffix: str = "") -> list[str]:
return [t["name"] for t in self.get_all_pages(self.get_endpoint("/tags"), 100)]
def get_endpoint(self, resource: str) -> str:
return f"{GithubRemoteAPI.API_ENDPOINT}/{self.repository}{resource}"
+30
View File
@@ -2,6 +2,7 @@ from urllib.parse import quote
import requests
from git_flow import GitFlowError
from git_flow.git import Commit
from git_flow.remote.base import RemoteAPI
@@ -47,6 +48,35 @@ class GitlabRemoteAPI(RemoteAPI):
else:
raise GitFlowError("Ocurrió un error al crear el tag: " + response.text)
def get_merge_commits(self, merge_commit: str) -> list[Commit]:
mrs = self.get_json(
self.get_endpoint(f"/repository/commits/{merge_commit}/merge_requests")
).json()
mr = next((m for m in mrs if m.get("merge_commit_sha") == merge_commit), None)
if not mr:
raise GitFlowError(f"No se encontró un MR para el commit {merge_commit}")
items = self.get_all_pages(self.get_endpoint(f"/merge_requests/{mr['iid']}/commits"), 100)
# GitLab ya los devuelve del más nuevo al más viejo
return [
Commit(
c["short_id"][:7],
c["title"],
c["author_email"],
len(c["parent_ids"]) > 1,
)
for c in items
]
def list_tags(self, suffix: str = "") -> list[str]:
# "search" soporta "$" para anclar al final del nombre
params = {"search": suffix + "$"} if suffix else None
tags = self.get_all_pages(self.get_endpoint("/repository/tags"), 100, params)
return [t["name"] for t in tags]
def get_endpoint(self, resource: str) -> str:
project_id = quote(self.repository, safe="")
return f"{self.base_url}/api/v4/projects/{project_id}{resource}"