Compare commits

..
3 Commits
Author SHA1 Message Date
jt c1c1560b76 Merge branch 'main' into bugfix/pr-title-single-commit 2026-09-17 14:37:01 +00:00
jt 606d89ed29 Merge pull request 'fix: apply release prefix and ticket detection to single-commit PR titles' (#19) from bugfix/pr-title-single-commit into main
Publish to PyPI / Publish-to-PyPI (push) Failing after 14s
Reviewed-on: #19
2026-09-17 14:25:21 +00:00
Jonathan Teran 7bca4ba85c fix: apply release prefix and ticket detection to single-commit PR titles
The single-commit branch of the title generation logic used the raw
commit message verbatim, bypassing the release-branch prefix and
branch-ticket detection entirely. Both are now applied on top of the
commit message when there's only one commit.
2026-09-17 11:10:16 -03:00
13 changed files with 96 additions and 399 deletions
@@ -5,13 +5,13 @@ on:
- main - main
jobs: jobs:
Bump-Build-Publish: Publish-to-PyPI:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v7 uses: actions/checkout@v7
with: with:
fetch-depth: 10 fetch-depth: 0
- name: Configure git - name: Configure git
run: | run: |
@@ -19,7 +19,7 @@ jobs:
git config --global user.email "actions@git.jonathanteran.dev" git config --global user.email "actions@git.jonathanteran.dev"
git config --global --add safe.directory "$GITHUB_WORKSPACE" git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Set up Python - name: "Set up Python"
uses: actions/setup-python@v6 uses: actions/setup-python@v6
with: with:
python-version-file: ".python-version" python-version-file: ".python-version"
@@ -27,23 +27,11 @@ jobs:
- name: Install uv - name: Install uv
uses: astral-sh/setup-uv@v8.3.2 uses: astral-sh/setup-uv@v8.3.2
- name: Install git-flow and bump version - name: Bump version
id: version
run: | run: |
pip install git-flow-envs=="${{ vars.GITFLOWENVS_VERSION }}" uv run git-flow tag --token="${{ secrets.GITEA_TOKEN }}"
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: Build and publish - name: Build and publish
if: steps.version.outputs.should_build == 'true'
run: | run: |
uv build uv build
uv publish --token="${{ secrets.PYPI_TOKEN }}" uv publish --token="${{ secrets.PYPI_TOKEN }}"
-57
View File
@@ -1,60 +1,3 @@
## 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)
---
## v1.21.1 - 2026-09-17
- **bugfix**: apply release prefix and ticket detection to single-commit PR titles [[jteran](mailto:jteran@renatre.org.ar)] (e0200e3)
---
## v1.21.0 - 2026-09-17 ## v1.21.0 - 2026-09-17
- **feature**: downgrade python version for better compatibility [[jteran](mailto:jteran@renatre.org.ar)] (55172bd) - **feature**: downgrade python version for better compatibility [[jteran](mailto:jteran@renatre.org.ar)] (55172bd)
+13 -10
View File
@@ -1,15 +1,15 @@
from datetime import datetime from datetime import datetime
from os.path import isfile from os.path import isfile
from git_flow.git import Commit from git_flow.git import Git
class Changelog: class Changelog:
FILENAME = "CHANGELOG.md" FILENAME = "CHANGELOG.md"
COMMIT_MESSAGE = "chore: bump version and update CHANGELOG.md [skip ci]" COMMIT_MESSAGE = "chore: bump version and update CHANGELOG.md [skip ci]"
def update(self, title: str, commits: list[Commit]): def update(self, title: str, base: str, branch: str):
self._prepend(self.generate_entry(title, commits)) self._prepend(self.generate_entry(title, base, branch))
def generate_header(self, title): def generate_header(self, title):
now = datetime.now() now = datetime.now()
@@ -18,13 +18,16 @@ class Changelog:
""" """
def generate_content(self, commits: list[Commit]): def generate_content(self, base: str, branch: str):
commits = Git(
"log", base + ".." + branch, first_parent=True, format="%h", merges=False
).lines()
content = "" content = ""
for commit in commits: for commit in commits:
message = commit.subject message = Git("show", commit, patch=False, format="%s").firstline()
email = commit.email email = Git("show", commit, patch=False, format="%ae").firstline()
username = email[: email.index("@")] if "@" in email else email username = email[: email.index("@")]
description = message description = message
if ":" in message: if ":" in message:
@@ -33,7 +36,7 @@ class Changelog:
commit_message = message[index + 1 :] commit_message = message[index + 1 :]
description = f"**{commit_type}**: {commit_message}" description = f"**{commit_type}**: {commit_message}"
content += f"- {description} [[{username}](mailto:{email})] ({commit.sha})\n" content += f"- {description} [[{username}](mailto:{email})] ({commit})\n"
return content return content
@@ -44,10 +47,10 @@ class Changelog:
""" """
def generate_entry(self, title: str, commits: list[Commit]): def generate_entry(self, title: str, base: str, branch: str):
return ( return (
self.generate_header(title) self.generate_header(title)
+ self.generate_content(commits) + self.generate_content(base, branch)
+ self.generate_footer() + 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 ( from git_flow import (
BRANCH_TYPES, BRANCH_TYPES,
COMMIT_TYPES, REPOSITORY_TOKEN_FILENAME,
FLOWCONFIG_FILENAME, FLOWCONFIG_FILENAME,
FLOWCONFIG_VERSION, FLOWCONFIG_VERSION,
REPOSITORY_TOKEN_FILENAME, COMMIT_TYPES,
GitFlowError, GitFlowError,
) )
from git_flow.git import Git from git_flow.git import Git
from git_flow.io import *
from git_flow.remote.base import RemoteAPI from git_flow.remote.base import RemoteAPI
from git_flow.remote.bitbucket import BitbucketRemoteAPI from git_flow.remote.bitbucket import BitbucketRemoteAPI
from git_flow.remote.gitea import GiteaRemoteAPI
from git_flow.remote.github import GithubRemoteAPI from git_flow.remote.github import GithubRemoteAPI
from git_flow.remote.gitea import GiteaRemoteAPI
from git_flow.remote.gitlab import GitlabRemoteAPI 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 {} flowconfig = Git.get_config(FLOWCONFIG_FILENAME) if isfile(FLOWCONFIG_FILENAME) else {}
environments = ( environments = (
@@ -102,7 +102,7 @@ def ensure_clean_worktree(has_remote: bool):
if not status: if not status:
return return
not_empty = any(s.index != " " or s.worktree != " " for s in status) not_empty = any(map(lambda s: s.index != " " or s.worktree != " ", status))
if not_empty: if not_empty:
if not has_remote: if not has_remote:
@@ -162,23 +162,23 @@ def get_commit_message(commit_types: list[str] = COMMIT_TYPES) -> str:
return commit_type + ": " + commit_message return commit_type + ": " + commit_message
def io_error(message: str, title: str | None = None): def io_error(message: str, title: Optional[str] = None):
_io_status(message, "✖ Error: ", "red", title) _io_status(message, "✖ Error: ", "red", title)
def io_warning(message: str, title: str | None = None): def io_warning(message: str, title: Optional[str] = None):
_io_status(message, "⚠ Warning: ", "yellow", title) _io_status(message, "⚠ Warning: ", "yellow", title)
def io_info(message: str, title: str | None = None): def io_info(message: str, title: Optional[str] = None):
_io_status(message, "ℹ Info: ", "blue", title) _io_status(message, "ℹ Info: ", "blue", title)
def io_success(message: str, title: str | None = None): def io_success(message: str, title: Optional[str] = None):
_io_status(message, "✔ Success: ", "green", title) _io_status(message, "✔ Success: ", "green", title)
def _io_status(message: str, prefix: str, style: str, title: str | None = None): def _io_status(message: str, prefix: str, style: str, title: Optional[str] = None):
if title: if title:
rich.print( rich.print(
rich.panel.Panel( rich.panel.Panel(
+1 -2
View File
@@ -111,12 +111,11 @@ def create_pull_request(token: str, branch: str, target: str):
if base.io_confirm("¿Desea cambiar el título del PR?", False): if base.io_confirm("¿Desea cambiar el título del PR?", False):
title = base.io_prompt("Título del PR", persistent=True) 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( message = base.get_remote_api(token).create_pull_request(
branch, branch,
target, target,
title, title,
changelog.generate_content(commits), changelog.generate_content(target, branch),
branch not in base.environments, branch not in base.environments,
) )
+49 -54
View File
@@ -1,5 +1,8 @@
from typing import Optional
import typer import typer
import git_flow.command.base as base
from git_flow import ( from git_flow import (
COMMIT_TYPE_INCREMENT, COMMIT_TYPE_INCREMENT,
SEMVER_MAJOR, SEMVER_MAJOR,
@@ -9,14 +12,13 @@ from git_flow import (
GitFlowError, GitFlowError,
) )
from git_flow.changelog import Changelog from git_flow.changelog import Changelog
from git_flow.command import base
from git_flow.git import Git from git_flow.git import Git
app = typer.Typer() app = typer.Typer()
@app.command() @app.command()
def tag(token: str | None = None, update_changelog: bool = False): def tag(token: Optional[str] = None):
"""Crea un nuevo tag para el último merge.""" """Crea un nuevo tag para el último merge."""
base.ensure_initialized() base.ensure_initialized()
@@ -25,83 +27,74 @@ def tag(token: str | None = None, update_changelog: bool = False):
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.")
token, ci = get_token_and_ci(token) branch = Git(
"show", get_last_merge_commit() + "^2", patch=False, format="%h"
if ci and not token:
raise GitFlowError("No hay token disponible")
merge_commit = Git(
"log", first_parent=True, merges=True, max_count=1, format="%H"
).firstline() ).firstline()
if not merge_commit:
raise GitFlowError("No hay merges a taggear.")
# 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 ""
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) fork_point = Git.get_first_fork_point(branch, target)
commits = Git.get_commits(fork_point, branch) commits = Git("log", fork_point + ".." + branch, format="%s").lines()
# Último tag se obtiene localmente next_tag = get_next_tag_from_commits(commits, target)
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: if not next_tag:
base.io_warning( base.io_info(
"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."
) )
return
raise typer.Exit(code=1) token, ci = get_token_and_ci(token)
if not token:
raise GitFlowError("No hay token disponible")
if update_changelog:
changelog = Changelog() changelog = Changelog()
changelog.update(next_tag, commits)
changelog.update(next_tag, fork_point, branch)
Git("add", Changelog.FILENAME).exec(print="Agregando nuevo CHANGELOG.md") Git("add", Changelog.FILENAME).exec(print="Agregando nuevo CHANGELOG.md")
Git("commit", message=Changelog.COMMIT_MESSAGE).exec(print="Creando commit") Git("commit", message=Changelog.COMMIT_MESSAGE).exec(print="Creando commit")
tag_commit = Git("show", "HEAD", patch=False, format="%h").firstline()
if ci: if ci:
Git("push").exec() Git("push").exec(print="Subiendo commit al remoto para taggearlo")
tag_commit = Git("show", "HEAD", patch=False, format="%H").firstline()
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))
Git("tag", next_tag, tag_commit).exec(print="Creando tag localmente") Git("tag", next_tag, tag_commit).exec(print="Creando tag localmente")
def get_token_and_ci(token: str | None): def get_token_and_ci(token: Optional[str]):
if token: try:
return (token, True)
else:
return (base.ensure_repository_token(), False) return (base.ensure_repository_token(), False)
except GitFlowError:
return (token, True)
def get_next_tag_from_commits( def get_last_merge_commit():
commits: list[str], suffix: str, current_tag: str | None commit = Git(
) -> str | None: "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:
increment = SEMVER_SKIP increment = SEMVER_SKIP
for commit in commits: for commit in commits:
commit_type = commit.partition(":")[0] commit_type = commit[: commit.index(":")]
increment = max(increment, COMMIT_TYPE_INCREMENT.get(commit_type, SEMVER_SKIP)) increment = max(increment, COMMIT_TYPE_INCREMENT.get(commit_type, SEMVER_SKIP))
if increment == SEMVER_SKIP: tag = Git.get_current_tag() or f"v0.0.0-{branch}"
return None
version = (current_tag or "v0.0.0" + suffix).removeprefix("v").removesuffix(suffix) until_dash = tag.index("-") if "-" in tag else None
[major, minor, patch] = map(int, version.split(".")) suffix = tag[until_dash:] if until_dash is not None else ""
[major, minor, patch] = map(int, tag[1:until_dash].split("."))
if increment == SEMVER_MAJOR: if increment == SEMVER_MAJOR:
major += 1 major += 1
@@ -112,5 +105,7 @@ def get_next_tag_from_commits(
patch = 0 patch = 0
elif increment == SEMVER_PATCH: elif increment == SEMVER_PATCH:
patch += 1 patch += 1
elif increment == SEMVER_SKIP:
suffix = "-r" + Git("rev-list", "HEAD", count=True).firstline()
return f"v{major}.{minor}.{patch}{suffix}" return None if increment == SEMVER_SKIP else f"v{major}.{minor}.{patch}{suffix}"
+2 -34
View File
@@ -1,20 +1,9 @@
import subprocess import subprocess
from dataclasses import dataclass
from git_flow import FLOWCONFIG_FILENAME from git_flow import FLOWCONFIG_FILENAME
from git_flow.io import * 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 Git:
class Status: class Status:
worktree: str worktree: str
@@ -63,15 +52,8 @@ class Git:
return list(map(Git.Status, Git("status", porcelain=True).lines(False))) return list(map(Git.Status, Git("status", porcelain=True).lines(False)))
@staticmethod @staticmethod
def get_current_tag(suffix: str = ""): def get_current_tag():
"""Último tag SemVer alcanzable desde HEAD, con el sufijo exacto indicado.""" return Git("describe", abbrev="0", tags=True).firstline(check=False, print="Obteniendo tag actual")
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 @staticmethod
def get_first_fork_point(branch: str, env: str): def get_first_fork_point(branch: str, env: str):
@@ -83,20 +65,6 @@ class Git:
return Git("show", env_commits[-1] + "^", patch=False, format="%h").firstline() 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 @staticmethod
def _get_references(kind: str): def _get_references(kind: str):
prefix = "refs/" + kind prefix = "refs/" + kind
+6 -10
View File
@@ -1,12 +1,10 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import traceback
from subprocess import SubprocessError
import typer import typer
from git_flow import GitFlowError from git_flow import GitFlowError
from git_flow.command import base, branch, commit, init, merge, new, release, tag import git_flow.command.base as base
from git_flow.command import init, new, commit, merge, tag, release, branch
REPOSITORY_TOKEN_PATH = ".repository-token" REPOSITORY_TOKEN_PATH = ".repository-token"
LOCALE = "es_AR.UTF-8" LOCALE = "es_AR.UTF-8"
@@ -27,10 +25,8 @@ def main():
app() app()
print() print()
except GitFlowError as e: except GitFlowError as e:
lines = [str(e), ""] base.io_error(str(e), title="Git Flow")
lines += traceback.format_exception(e) except Exception as e:
base.io_error("".join(lines), title="Git Flow") base.io_error(str(e), title="Inesperado")
except SubprocessError as e: except KeyboardInterrupt as e:
base.io_error(str(e), title="Comando")
except KeyboardInterrupt:
base.io_error("Ejecución abortada") base.io_error("Ejecución abortada")
+1 -58
View File
@@ -1,12 +1,9 @@
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
import re
import giturlparse import giturlparse
import requests
from git_flow import SUPPORTED_REMOTE_URL_SCHEMAS, GitFlowError from git_flow import SUPPORTED_REMOTE_URL_SCHEMAS, GitFlowError
from git_flow.git import Commit, Git from git_flow.git import Git
class RemoteAPI(ABC): class RemoteAPI(ABC):
@@ -68,18 +65,6 @@ class RemoteAPI(ABC):
def create_tag(self, tag: str, commit: str) -> str: def create_tag(self, tag: str, commit: str) -> str:
pass 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 @abstractmethod
def get_endpoint(self, resource: str) -> str: def get_endpoint(self, resource: str) -> str:
pass pass
@@ -90,45 +75,3 @@ class RemoteAPI(ABC):
"Content-Type": "application/json", "Content-Type": "application/json",
"Authorization": "Bearer " + self.token, "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,8 +1,5 @@
import re
import requests import requests
from git_flow import GitFlowError from git_flow import GitFlowError
from git_flow.git import Commit
from git_flow.remote.base import RemoteAPI from git_flow.remote.base import RemoteAPI
@@ -47,51 +44,5 @@ class BitbucketRemoteAPI(RemoteAPI):
else: else:
raise GitFlowError("Ocurrió un error al crear el tag: " + response.text) 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: def get_endpoint(self, resource: str) -> str:
return f"{BitbucketRemoteAPI.API_ENDPOINT}/{self.repository}/{resource}" return f"{BitbucketRemoteAPI.API_ENDPOINT}/{self.repository}/{resource}"
-35
View File
@@ -1,6 +1,5 @@
import requests import requests
from git_flow import GitFlowError from git_flow import GitFlowError
from git_flow.git import Commit
from git_flow.remote.base import RemoteAPI from git_flow.remote.base import RemoteAPI
@@ -45,40 +44,6 @@ class GiteaRemoteAPI(RemoteAPI):
else: else:
raise GitFlowError("Ocurrió un error al crear el tag: " + response.text) 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: def get_endpoint(self, resource: str) -> str:
return f"{self.base_url}/api/v1/repos/{self.repository}{resource}" return f"{self.base_url}/api/v1/repos/{self.repository}{resource}"
-24
View File
@@ -1,6 +1,5 @@
import requests import requests
from git_flow import GitFlowError from git_flow import GitFlowError
from git_flow.git import Commit
from git_flow.remote.base import RemoteAPI from git_flow.remote.base import RemoteAPI
@@ -43,28 +42,5 @@ class GithubRemoteAPI(RemoteAPI):
else: else:
raise GitFlowError("Ocurrió un error al crear el tag: " + response.text) 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: def get_endpoint(self, resource: str) -> str:
return f"{GithubRemoteAPI.API_ENDPOINT}/{self.repository}{resource}" return f"{GithubRemoteAPI.API_ENDPOINT}/{self.repository}{resource}"
+1 -31
View File
@@ -2,7 +2,6 @@ from urllib.parse import quote
import requests import requests
from git_flow import GitFlowError from git_flow import GitFlowError
from git_flow.git import Commit
from git_flow.remote.base import RemoteAPI from git_flow.remote.base import RemoteAPI
@@ -46,36 +45,7 @@ class GitlabRemoteAPI(RemoteAPI):
if response.ok: if response.ok:
return "Tag creado exitosamente: " + tag return "Tag creado exitosamente: " + tag
else: else:
raise GitFlowError("Ocurrió un error al crear el tag para repositorio " + quote(self.repository, safe="") + ": " + response.text) 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: def get_endpoint(self, resource: str) -> str:
project_id = quote(self.repository, safe="") project_id = quote(self.repository, safe="")