chore: bump version and update CHANGELOG.md [skip ci]

refactor: move constants

Approved-by: Jonathan Teran

CHANGELOG.md

@@ -1,3 +1,22 @@
+## v1.5.1 - 2025-11-27
+
+### Commits
+
+- **refactor**:  muevo constantes a modulo git_flow para centralizar uso [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (29757cc)
+- **bugfix**:  ignorar carpetas generadas en build de lsp [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (7f857fd)
+
+---
+
+
+## v1.5.0 - 2025-11-27
+
+### Commits
+
+- **feature**:  modifico formato de listado de ramas [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (7177084)
+
+---
+
+
 ## v1.4.0 - 2025-11-23
 
 ### Commits

pyrightconfig.json

@@ -0,0 +1,6 @@
+{
+  "exclude": [
+    "build",
+    "**/*.egg-info"
+  ]
+}

src/git_flow/__init__.py

@@ -18,7 +18,7 @@ COMMIT_TYPES = [
     "docs",
     "style",
     "test",
-    "wip"
+    "wip",
 ]
 
 # Commits con estos valores incrementan el componente correspondiente
@@ -46,3 +46,15 @@ SUPPORTED_REMOTE_APIS = [
 ]
 
 REPOSITORY_TOKEN_FILENAME = ".repository-token"
+
+COLOR_BLACK = "\033[30m"
+COLOR_RED = "\033[31m"
+COLOR_GREEN = "\033[32m"
+COLOR_YELLOW = "\033[33m"
+COLOR_BLUE = "\033[34m"
+COLOR_5 = "\033[35m"
+COLOR_6 = "\033[36m"
+COLOR_7 = "\033[37m"
+COLOR_BLACK_BOLD = "\033[1;30m"
+COLOR_WHITE_BOLD = "\033[1;37m"
+COLOR_RESET = "\033[0m"

src/git_flow/command/base.py

@@ -4,6 +4,11 @@ from os.path import isfile
 
 from git_flow import (
     BRANCH_TYPES,
+    COLOR_BLUE,
+    COLOR_GREEN,
+    COLOR_RED,
+    COLOR_RESET,
+    COLOR_YELLOW,
     REPOSITORY_TOKEN_FILENAME,
     GitFlowError,
 )
@@ -12,17 +17,6 @@ from git_flow.remote.base import RemoteAPI
 from git_flow.remote.bitbucket import BitbucketRemoteAPI
 from git_flow.remote.github import GithubRemoteAPI
 
-COLOR_BLACK = "\033[30m"
-COLOR_RED = "\033[31m"
-COLOR_GREEN = "\033[32m"
-COLOR_YELLOW = "\033[33m"
-COLOR_BLUE = "\033[34m"
-COLOR_5 = "\033[35m"
-COLOR_6 = "\033[36m"
-COLOR_7 = "\033[37m"
-COLOR_BLACK_BOLD = "\033[1;30m"
-COLOR_RESET = "\033[0m"
-
 TYPE_SUCCESS = 0
 TYPE_WARNING = 1
 TYPE_ERROR = 2

src/git_flow/command/branch.py

@@ -1,6 +1,6 @@
 from argparse import ArgumentParser, Namespace
-from git_flow import GitFlowError
+from git_flow import COLOR_WHITE_BOLD,  COLOR_GREEN, COLOR_RED, COLOR_RESET, GitFlowError
-from git_flow.command.base import COLOR_GREEN, COLOR_RED, COLOR_RESET, Command
+from git_flow.command.base import Command
 from git_flow.git import Git
 
 
@@ -30,17 +30,23 @@ class BranchCommand(Command):
         self.environments = self.flowconfig["flow.branches"].split(",")
 
         if args.environment is None:
+            self.show_envs()
             self.show_all_branches()
+        elif args.environment in self.environments:
+            self.show_envs()
+            self.show_env_branches(args.environment)
         elif args.environment == "trash":
             self.show_trash_branches()
-        elif args.environment in self.environments:
-            self.show_env_branches(args.environment)
         else:
             raise GitFlowError(f"'{args.environment}' no es un entorno válido.")
 
     def show_trash_branches(self):
         branches = self.get_trash_branches()
 
+        if not branches:
+            print("No hay ramas a mostrar.")
+            return
+
         for branch in branches:
             prefix = (COLOR_RED + "*") if branch == self.current_branch else " "
             print(prefix + " " + branch + COLOR_RESET)
@@ -50,30 +56,34 @@ class BranchCommand(Command):
 
     def show_all_branches(self):
         for environment in self.environments:
-            self.show_env_branches(environment)
+            self.show_env_branches(environment, len(self.environments) > 1)
 
         trash = len(self.get_trash_branches())
-        print("\nTrash: " + str(trash) + " rama" + ("" if trash == 1 else "s"))
 
-    def show_env_branches(self, environment: str):
+        if trash:
+            print()
+            print(COLOR_WHITE_BOLD + "Papelera: " + COLOR_RESET + str(trash) + " rama" + ("" if trash == 1 else "s"))
+
+    def show_envs(self):
+        print(COLOR_WHITE_BOLD + "Entornos" + COLOR_RESET)
+        for environment in self.environments:
+            prefix = (COLOR_GREEN + "*") if environment == self.current_branch else " "
+            print(prefix + " " + environment + COLOR_RESET)
+        print()
+
+    def show_env_branches(self, environment: str, show_env: bool = False):
         is_first_env = environment == self.environments[0]
-        branches = (
+        pattern = "refs/heads/" if is_first_env else "refs/heads/release/" + environment + "/"
-            Git(
+        pattern += "*/*"
-                "for-each-ref",
+        exclude = ["refs/heads/trash/", "refs/heads/release/"] if is_first_env else []
-                "refs/heads/",
+        branches = Git("for-each-ref", pattern, exclude=exclude, format=BRANCH_FORMAT).lines()
-                exclude=["refs/heads/trash/", "refs/heads/release/"],
+
-                format=BRANCH_FORMAT,
+        print(COLOR_WHITE_BOLD + (environment if show_env else "Ramas") + COLOR_RESET)
-            ).lines()
+
-            if is_first_env
+        if not branches:
-            else Git(
+            print("No hay ramas a mostrar.")
-                "for-each-ref",
+            return
-                "refs/heads/release/" + environment + "/",
-                format=BRANCH_FORMAT,
-            ).lines()
-        )
 
         for branch in branches:
             prefix = (COLOR_GREEN + "*") if branch == self.current_branch else " "
             print(prefix + " " + branch + COLOR_RESET)
-
-

src/git_flow/command/init.py

@@ -1,5 +1,4 @@
 from argparse import Namespace
-import os
 from git_flow import GitFlowError
 from git_flow.command.base import Command
 from git_flow.git import FLOWCONFIG_FILE, Git

src/git_flow/command/tag.py

@@ -56,7 +56,7 @@ class TagCommand(Command):
     def get_token_and_ci(self, args: Namespace):
         try:
             return (self.ensure_repository_token(), False)
-        except GitFlowError as e:
+        except GitFlowError:
             return (args.token, True)
 
     def setup_parser(self, parser: ArgumentParser) -> ArgumentParser:

src/git_flow/io.py

@@ -1,14 +1,6 @@
 import sys
 
-
+from git_flow import COLOR_BLACK_BOLD, COLOR_BLUE, COLOR_GREEN, COLOR_RED, COLOR_RESET, COLOR_YELLOW
-COLOR_BLACK = '\033[30m'
-COLOR_RED = '\033[31m'
-COLOR_GREEN = '\033[32m'
-COLOR_YELLOW = '\033[33m'
-COLOR_BLUE = '\033[34m'
-COLOR_BLACK_BOLD = '\033[1;30m'
-COLOR_RESET = '\033[0m'
-
 
 def confirm(prompt, default: bool = True):
     user_input = input(prompt + (" [Y/n]: " if default else " [y/N]: "))