From aacc5b90e225b6956bbdafc0d834f822b065c4dc Mon Sep 17 00:00:00 2001 From: Jonathan Teran Carballo Date: Sat, 26 Sep 2026 21:15:20 -0300 Subject: [PATCH 1/4] bugfix: prevent commits on environments --- README.md | 2 +- src/git_flow/command/commit.py | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 58d5c3a..a133a25 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ más información): - `init`: Inicializa el repositorio para utilizar git-flow (ramas principales y remoto). - `new`: Crea una nueva rama siguiendo CB. -- `commit`: Crea un commit siguiendo CC. +- `commit`: Crea un commit siguiendo CC. No permite commitear directamente sobre un entorno. - `merge`: Mergea la rama actual a uno de los entornos. - `tag`: Crea un tag sobre el ultimo merge siguiendo SemVer (ver [Tag](#tag)). - `release`: Prepara la rama actual para pasarse al siguiente entorno configurado. diff --git a/src/git_flow/command/commit.py b/src/git_flow/command/commit.py index a7834d6..07c3559 100644 --- a/src/git_flow/command/commit.py +++ b/src/git_flow/command/commit.py @@ -15,6 +15,15 @@ def commit(): base.ensure_initialized() branch = base.ensure_right_branch() + # Una rama WIP termina squasheando en su rama original, que tampoco puede ser un entorno + target_branch = branch.removeprefix(WIP_BRANCH_PREFIX) + + if target_branch in base.environments: + raise GitFlowError( + f"No se puede commitear directamente sobre el entorno '{target_branch}'. " + "Debe crear una rama de trabajo con el comando `new`." + ) + if not _has_files_staged(): base.io_warning("No hay cambios en el indice para commitear.") if base.io_confirm("¿Desea agregar la carpeta actual?"): -- 2.54.0 From e13beae27945deefd619ad7acc6de15ffb296a8b Mon Sep 17 00:00:00 2001 From: Jonathan Teran Carballo Date: Mon, 28 Sep 2026 14:22:49 -0300 Subject: [PATCH 2/4] feature: show table with staged changes before comit --- src/git_flow/command/commit.py | 50 ++++++++++++++++++++++++++++++---- src/git_flow/git.py | 7 +++-- 2 files changed, 48 insertions(+), 9 deletions(-) diff --git a/src/git_flow/command/commit.py b/src/git_flow/command/commit.py index 07c3559..9ef004f 100644 --- a/src/git_flow/command/commit.py +++ b/src/git_flow/command/commit.py @@ -1,10 +1,12 @@ from datetime import datetime import typer +from rich.table import Table -import git_flow.command.base as base from git_flow import TRASH_BRANCH_PREFIX, WIP_BRANCH_PREFIX, GitFlowError +from git_flow.command import base from git_flow.git import Git +from git_flow.io import console app = typer.Typer() @@ -31,6 +33,11 @@ def commit(): else: raise GitFlowError("Debe agregar algún cambio al indice para continuar.") + _show_index() + + if not base.io_confirm("¿Desea commitear estos cambios?"): + raise GitFlowError("Ejecución cancelada.") + message = base.get_commit_message() commit_type = message[: message.index(":")] @@ -63,10 +70,41 @@ def _has_files_staged(): if not status: raise GitFlowError("No hay cambios para commitear.") - files_in_index = [] + return any(_is_staged(s) for s in status) - for s in status: - if s.worktree != "?" and s.worktree != " ": - files_in_index.append(s.file) - return len(files_in_index) > 0 +def _is_staged(s: Git.Status) -> bool: + return s.index != "?" and s.index != " " + + +INDEX_STATES = { + "M": "modificado", + "T": "cambio de tipo", + "A": "agregado", + "D": "eliminado", + "R": "renombrado", + "C": "copiado", + "U": "en conflicto", +} + + +def _show_index(): + """Muestra en una tabla los archivos del indice (los que entran en el commit), e informa + cuántos archivos quedan con cambios fuera del indice.""" + status = Git.status() + staged = [s for s in status if _is_staged(s)] + not_staged = [s for s in status if s.worktree != " "] + + table = Table(title="Cambios a commitear", title_justify="left", title_style="bold") + table.add_column("Estado", style="cyan", no_wrap=True) + table.add_column("Archivo") + + for s in staged: + table.add_row(INDEX_STATES.get(s.index, s.index), s.file) + + console.print(table) + + if not_staged: + base.io_info( + f"{len(not_staged)} archivo(s) con cambios fuera del indice no se incluirán en el commit." + ) diff --git a/src/git_flow/git.py b/src/git_flow/git.py index 95e4f52..9f754e8 100644 --- a/src/git_flow/git.py +++ b/src/git_flow/git.py @@ -26,8 +26,9 @@ class Git: file: str def __init__(self, line: str) -> None: - self.worktree = line[0] - self.index = line[1] + # Formato porcelain "XY ": X es el estado en el indice, Y en el worktree + self.index = line[0] + self.worktree = line[1] self.file = line[3:].strip("\n") command: list[str] @@ -170,7 +171,7 @@ class Git: process = self._get(**kwargs) lines = process.stdout.splitlines() - return lines if not strip else list(map(lambda l: l.strip(), lines)) + return lines if not strip else [l.strip() for l in lines] def firstline(self, **kwargs): lines = self.lines(**kwargs) -- 2.54.0 From e2e1c4b417d979161f6723ae9af2bd4ef19cbcb4 Mon Sep 17 00:00:00 2001 From: Jonathan Teran Carballo Date: Mon, 28 Sep 2026 14:23:49 -0300 Subject: [PATCH 3/4] feature: change table border style --- src/git_flow/command/base.py | 3 ++- src/git_flow/command/commit.py | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/git_flow/command/base.py b/src/git_flow/command/base.py index 9e6e8ae..7eb0a6f 100644 --- a/src/git_flow/command/base.py +++ b/src/git_flow/command/base.py @@ -5,6 +5,7 @@ from os.path import isfile import questionary import rich import rich.panel +from rich import box from rich.table import Table from git_flow import ( @@ -201,7 +202,7 @@ def show_commits(title: str, revision_range: str): if not lines: raise GitFlowError("No hay cambios a mergear.") - table = Table(title=title, title_justify="left", title_style="bold") + table = Table(title=title, title_justify="left", title_style="bold", box=box.SQUARE) table.add_column("Fecha", style="dim", no_wrap=True) table.add_column("Tipo", style="cyan", no_wrap=True) table.add_column("Mensaje") diff --git a/src/git_flow/command/commit.py b/src/git_flow/command/commit.py index 9ef004f..fbc5e4b 100644 --- a/src/git_flow/command/commit.py +++ b/src/git_flow/command/commit.py @@ -1,6 +1,7 @@ from datetime import datetime import typer +from rich import box from rich.table import Table from git_flow import TRASH_BRANCH_PREFIX, WIP_BRANCH_PREFIX, GitFlowError @@ -95,7 +96,12 @@ def _show_index(): staged = [s for s in status if _is_staged(s)] not_staged = [s for s in status if s.worktree != " "] - table = Table(title="Cambios a commitear", title_justify="left", title_style="bold") + table = Table( + title="Cambios a commitear", + title_justify="left", + title_style="bold", + box=box.SQUARE, + ) table.add_column("Estado", style="cyan", no_wrap=True) table.add_column("Archivo") -- 2.54.0 From 76dd1774213a2ac520548137fc9cc571b64aab7e Mon Sep 17 00:00:00 2001 From: Jonathan Teran Carballo Date: Mon, 28 Sep 2026 14:27:28 -0300 Subject: [PATCH 4/4] refactor: inform instead of confirming current branch --- src/git_flow/command/base.py | 9 ++++----- src/git_flow/command/commit.py | 2 +- src/git_flow/command/merge.py | 2 +- src/git_flow/command/new.py | 2 +- src/git_flow/command/release.py | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/git_flow/command/base.py b/src/git_flow/command/base.py index 7eb0a6f..2c988b4 100644 --- a/src/git_flow/command/base.py +++ b/src/git_flow/command/base.py @@ -52,15 +52,14 @@ def ensure_initialized(): ) -def ensure_right_branch(): +def ensure_on_branch(): branch = Git.get_current_branch() if branch == "HEAD": raise GitFlowError("No se encuentra parado sobre una rama.") - elif io_confirm(f"Rama actual: {branch}. ¿Es correcto?"): - return branch - else: - raise GitFlowError("Ejecución cancelada.") + + io_info(f"Rama actual: {branch}") + return branch def get_branch_env_and_type(branch: str) -> tuple[str, str]: diff --git a/src/git_flow/command/commit.py b/src/git_flow/command/commit.py index fbc5e4b..5f7c310 100644 --- a/src/git_flow/command/commit.py +++ b/src/git_flow/command/commit.py @@ -16,7 +16,7 @@ app = typer.Typer() def commit(): """Crea un commit siguiendo el formato de Conventional Commits""" base.ensure_initialized() - branch = base.ensure_right_branch() + branch = base.ensure_on_branch() # Una rama WIP termina squasheando en su rama original, que tampoco puede ser un entorno target_branch = branch.removeprefix(WIP_BRANCH_PREFIX) diff --git a/src/git_flow/command/merge.py b/src/git_flow/command/merge.py index 454d4eb..9c05184 100644 --- a/src/git_flow/command/merge.py +++ b/src/git_flow/command/merge.py @@ -15,7 +15,7 @@ def merge(): """Realiza el merge de la rama, o crea el PR para hacerlo si tiene un remoto configurado""" base.ensure_initialized() - branch = base.ensure_right_branch() + branch = base.ensure_on_branch() if branch in base.environments: if branch == base.environments[-1]: diff --git a/src/git_flow/command/new.py b/src/git_flow/command/new.py index 0dee72b..d6e94ae 100644 --- a/src/git_flow/command/new.py +++ b/src/git_flow/command/new.py @@ -14,7 +14,7 @@ def new(): """Crea una nueva rama siguiendo Conventional Branches""" base.ensure_initialized() - branch = base.ensure_right_branch() + branch = base.ensure_on_branch() if branch not in base.environments: base.io_warning("La rama actual no corresponde a un entorno configurado.") diff --git a/src/git_flow/command/release.py b/src/git_flow/command/release.py index b0556d4..8c582cd 100644 --- a/src/git_flow/command/release.py +++ b/src/git_flow/command/release.py @@ -12,7 +12,7 @@ def release(): """Realiza el merge de la rama, o crea el PR para hacerlo si tiene un remoto configurado""" base.ensure_initialized() - branch = base.ensure_right_branch() + branch = base.ensure_on_branch() env, _ = base.get_branch_env_and_type(branch) if env == base.environments[-1]: -- 2.54.0