github2gerrit 0.1.14__tar.gz → 0.1.16__tar.gz

{github2gerrit-0.1.14 → github2gerrit-0.1.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: github2gerrit
-Version: 0.1.14
+Version: 0.1.16
 Summary: Submit a GitHub pull request to a Gerrit repository.
 Project-URL: Homepage, https://github.com/lfreleng-actions/github2gerrit
 Project-URL: Repository, https://github.com/lfreleng-actions/github2gerrit

{github2gerrit-0.1.14 → github2gerrit-0.1.16}/action.yaml

@@ -81,6 +81,10 @@ inputs:
     description: "Normalize commit messages to conventional commit format"
     required: false
     default: "false"
+  VERBOSE:
+    description: "Enable verbose output (sets log level to DEBUG)"
+    required: false
+    default: "false"
   GERRIT_SERVER:
     description: "Gerrit server hostname; derived if not supplied explicitly"
     required: false
@@ -130,13 +134,13 @@ runs:
   steps:
     - name: Setup Python
       # yamllint disable-line rule:line-length
-      uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065  # v5.6.0
+      uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c  # v6.0.0
       with:
         python-version-file: '${{ github.action_path }}/pyproject.toml'
 
     - name: Setup uv
       # yamllint disable-line rule:line-length
-      uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b  # v6.6.0
+      uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e  # v6.8.0
 
     - name: Checkout repository
       # yamllint disable-line rule:line-length
@@ -280,6 +284,7 @@ runs:
         DUPLICATE_TYPES: ${{ inputs.DUPLICATE_TYPES }}
         NORMALISE_COMMIT: ${{ inputs.NORMALISE_COMMIT }}
         G2G_USE_SSH_AGENT: ${{ inputs.G2G_USE_SSH_AGENT }}
+        G2G_VERBOSE: ${{ inputs.VERBOSE }}
 
         # Optional Gerrit overrides (when .gitreview is missing)
         GERRIT_SERVER: ${{ inputs.GERRIT_SERVER }}

{github2gerrit-0.1.14 → github2gerrit-0.1.16}/src/github2gerrit/cli.py

@@ -36,6 +36,7 @@ from .github_api import get_pr_title_body
 from .github_api import get_pull
 from .github_api import get_repo_from_env
 from .github_api import iter_open_pulls
+from .gitutils import CommandError
 from .gitutils import run_cmd
 from .models import GitHubContext
 from .models import Inputs
@@ -51,6 +52,7 @@ from .ssh_common import build_non_interactive_ssh_env
 from .utils import append_github_output
 from .utils import env_bool
 from .utils import env_str
+from .utils import is_verbose_mode
 from .utils import log_exception_conditionally
 from .utils import parse_bool_env
 
@@ -245,7 +247,7 @@ if "--help" in sys.argv or _is_github_actions_context():
 
 app: typer.Typer = typer.Typer(
     add_completion=False,
-    no_args_is_help=False,
+    no_args_is_help=True,
     cls=cast(Any, _SingleUsageGroup),
     rich_markup_mode="rich",
     help="Tool to convert GitHub pull requests into Gerrit changes",
@@ -989,9 +991,60 @@ def _process_single(
                 else:
                     progress_tracker.change_updated()
         except Exception as exc:
+            # Enhanced error handling for CommandError to show git command
+            # details
+            if isinstance(exc, CommandError):
+                # Always show the basic error message
+                cmd_str = " ".join(exc.cmd) if exc.cmd else "unknown command"
+                basic_error = f"Git command failed: {cmd_str}"
+                if exc.returncode is not None:
+                    basic_error += f" (exit code: {exc.returncode})"
+
+                # In verbose mode, show detailed stdout/stderr
+                if is_verbose_mode():
+                    detailed_msg = basic_error
+                    if exc.stdout and exc.stdout.strip():
+                        detailed_msg += f"\nGit stdout: {exc.stdout.strip()}"
+                    if exc.stderr and exc.stderr.strip():
+                        detailed_msg += f"\nGit stderr: {exc.stderr.strip()}"
+
+                    # Show debugging suggestion for merge failures
+                    if "merge --squash" in " ".join(exc.cmd or []):
+                        detailed_msg += (
+                            "\n💡 For local debugging: python "
+                            "test_merge_failure.py --verbose"
+                        )
+
+                    safe_console_print(f"❌ {detailed_msg}", style="red")
+                    if progress_tracker:
+                        progress_tracker.add_error(basic_error)
+                        if exc.stderr and exc.stderr.strip():
+                            progress_tracker.add_error(
+                                f"Details: {exc.stderr.strip()}"
+                            )
+                else:
+                    # In non-verbose mode, show basic error with hint to enable
+                    # verbose
+                    hint_msg = (
+                        basic_error
+                        + "\n💡 Run with VERBOSE=true for detailed git output"
+                    )
+                    safe_console_print(f"❌ {hint_msg}", style="red")
+                    if progress_tracker:
+                        progress_tracker.add_error(basic_error)
+            else:
+                # For other exceptions, use original handling
+                error_msg = str(exc)
+                if progress_tracker:
+                    progress_tracker.add_error(f"Execution failed: {error_msg}")
+                else:
+                    safe_console_print(f"❌ Error: {error_msg}", style="red")
+
             log.debug("Execution failed; continuing to write outputs: %s", exc)
-            if progress_tracker:
-                progress_tracker.add_error("Execution failed")
+
+            # In verbose mode, also log the full exception with traceback
+            if is_verbose_mode():
+                log.exception("Full exception details:")
 
             result = SubmissionResult(
                 change_urls=[], change_numbers=[], commit_shas=[]