feature: show table with staged changes before comit
This commit is contained in:
@@ -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."
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user