github2gerrit 0.1.15__py3-none-any.whl → 0.1.16__py3-none-any.whl

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
@@ -246,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",
@@ -990,15 +991,56 @@ def _process_single(
                 else:
                     progress_tracker.change_updated()
         except Exception as exc:
-            error_msg = str(exc)
-            log.debug("Execution failed; continuing to write outputs: %s", 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"
+                        )
 
-            # Always show the actual error to the user, not just in debug mode
-            if progress_tracker:
-                progress_tracker.add_error(f"Execution failed: {error_msg}")
+                    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:
-                # If no progress tracker, show error directly
-                safe_console_print(f"❌ Error: {error_msg}", style="red")
+                # 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)
 
             # In verbose mode, also log the full exception with traceback
             if is_verbose_mode():

github2gerrit/core.py

@@ -2028,10 +2028,99 @@ class Orchestrator:
         # Create temp branch from base and merge-squash PR head
         tmp_branch = f"g2g_tmp_{gh.pr_number or 'pr'!s}_{os.getpid()}"
         os.environ["G2G_TMP_BRANCH"] = tmp_branch
+
+        log.debug(
+            "Git merge preparation: base_sha=%s, head_sha=%s, tmp_branch=%s",
+            base_sha,
+            head_sha,
+            tmp_branch,
+        )
+
+        # Check if we have any commits to merge
+        try:
+            merge_base = run_cmd(
+                ["git", "merge-base", base_sha, head_sha], cwd=self.workspace
+            ).stdout.strip()
+            log.debug("Merge base: %s", merge_base)
+
+            # Check if there are any commits between base and head
+            commits_to_merge = run_cmd(
+                ["git", "rev-list", f"{base_sha}..{head_sha}"],
+                cwd=self.workspace,
+            ).stdout.strip()
+            if not commits_to_merge:
+                log.warning(
+                    "No commits found between base (%s) and head (%s)",
+                    base_sha,
+                    head_sha,
+                )
+            else:
+                commit_count = len(commits_to_merge.splitlines())
+                log.debug("Found %d commits to merge", commit_count)
+
+        except Exception as debug_exc:
+            log.warning("Failed to analyze merge situation: %s", debug_exc)
+
         run_cmd(
             ["git", "checkout", "-b", tmp_branch, base_sha], cwd=self.workspace
         )
-        run_cmd(["git", "merge", "--squash", head_sha], cwd=self.workspace)
+
+        # Show git status before attempting merge
+        try:
+            status_output = run_cmd(
+                ["git", "status", "--porcelain"], cwd=self.workspace
+            ).stdout
+            if status_output.strip():
+                log.debug(
+                    "Git status before merge (modified files detected):\n%s",
+                    status_output,
+                )
+            else:
+                log.debug("Git status before merge: working directory clean")
+
+            # Show current branch
+            current_branch = run_cmd(
+                ["git", "branch", "--show-current"], cwd=self.workspace
+            ).stdout.strip()
+            log.debug("Current branch before merge: %s", current_branch)
+
+        except Exception as status_exc:
+            log.warning("Failed to get git status before merge: %s", status_exc)
+
+        log.debug("About to run: git merge --squash %s", head_sha)
+        try:
+            run_cmd(["git", "merge", "--squash", head_sha], cwd=self.workspace)
+        except CommandError as merge_exc:
+            # Enhanced error handling for git merge failures
+            error_details = self._analyze_merge_failure(
+                merge_exc, base_sha, head_sha
+            )
+
+            # Try to provide recovery suggestions
+            recovery_msg = self._suggest_merge_recovery(
+                merge_exc, base_sha, head_sha
+            )
+
+            # Log detailed error information
+            log.exception("Git merge --squash failed: %s", error_details)
+            if recovery_msg:
+                log.exception("Suggested recovery: %s", recovery_msg)
+
+            # Enhanced debugging if verbose mode is enabled
+            from .utils import is_verbose_mode
+
+            if is_verbose_mode():
+                self._debug_merge_failure_context(base_sha, head_sha)
+
+            # Re-raise with enhanced context
+            raise OrchestratorError(
+                f"Failed to merge PR commits: {error_details}"
+                + (
+                    f"\nSuggested recovery: {recovery_msg}"
+                    if recovery_msg
+                    else ""
+                )
+            ) from merge_exc
 
         def _collect_log_lines() -> list[str]:
             body = run_cmd(
@@ -4260,6 +4349,173 @@ class Orchestrator:
         except Exception as exc:
             log.debug("File validation failed (non-critical): %s", exc)
 
+    def _analyze_merge_failure(
+        self, merge_exc: CommandError, base_sha: str, head_sha: str
+    ) -> str:
+        """Analyze git merge failure and provide detailed error information."""
+        error_parts = []
+
+        # Include basic command info
+        if merge_exc.cmd:
+            error_parts.append(f"Command: {' '.join(merge_exc.cmd)}")
+        if merge_exc.returncode is not None:
+            error_parts.append(f"Exit code: {merge_exc.returncode}")
+
+        # Analyze stderr for common patterns
+        stderr = merge_exc.stderr or ""
+        if "conflict" in stderr.lower():
+            error_parts.append("Merge conflicts detected")
+        if "abort" in stderr.lower():
+            error_parts.append("Merge was aborted")
+        if "fatal" in stderr.lower():
+            error_parts.append("Fatal git error occurred")
+
+        # Include actual git output
+        if merge_exc.stdout and merge_exc.stdout.strip():
+            error_parts.append(f"Git output: {merge_exc.stdout.strip()}")
+        if stderr and stderr.strip():
+            error_parts.append(f"Git error: {stderr.strip()}")
+
+        return (
+            "; ".join(error_parts) if error_parts else "Unknown merge failure"
+        )
+
+    def _suggest_merge_recovery(
+        self, merge_exc: CommandError, base_sha: str, head_sha: str
+    ) -> str:
+        """Suggest recovery actions based on merge failure analysis."""
+        stderr = (merge_exc.stderr or "").lower()
+
+        if "conflict" in stderr:
+            return "Check for merge conflicts in the PR files and resolve them"
+        elif "fatal: refusing to merge unrelated histories" in stderr:
+            return (
+                "The branches have unrelated histories - check if the PR "
+                "branch is based on the correct target"
+            )
+        elif "nothing to commit" in stderr:
+            return (
+                "No changes to merge - the PR may already be merged or have "
+                "no differences"
+            )
+        elif "abort" in stderr:
+            return (
+                "Previous merge operation may have been interrupted - check "
+                "repository state"
+            )
+
+        # Try to provide generic guidance
+        try:
+            # Check if commits exist between base and head
+            commits_cmd = ["git", "rev-list", f"{base_sha}..{head_sha}"]
+            commits_result = run_cmd(
+                commits_cmd, cwd=self.workspace, check=False
+            )
+            if (
+                commits_result.returncode == 0
+                and not commits_result.stdout.strip()
+            ):
+                return (
+                    "No commits found between base and head - PR may be empty "
+                    "or already merged"
+                )
+        except Exception as e:
+            log.debug(
+                "Failed to check commit range for recovery suggestion: %s", e
+            )
+
+        return (
+            "Review git repository state and ensure PR branch is properly "
+            "synchronized with target"
+        )
+
+    def _debug_merge_failure_context(
+        self, base_sha: str, head_sha: str
+    ) -> None:
+        """Provide extensive debugging context for merge failures when verbose mode is enabled."""  # noqa: E501
+        log.error("=== VERBOSE MODE: Extended merge failure analysis ===")
+
+        try:
+            # Show detailed git log between base and head
+            log_result = run_cmd(
+                [
+                    "git",
+                    "log",
+                    "--oneline",
+                    "--graph",
+                    f"{base_sha}..{head_sha}",
+                ],
+                cwd=self.workspace,
+                check=False,
+            )
+            if log_result.returncode == 0:
+                log.error("Commits to be merged:\n%s", log_result.stdout)
+            else:
+                log.error("Failed to get commit log: %s", log_result.stderr)
+
+            # Show file differences
+            diff_result = run_cmd(
+                ["git", "diff", "--name-status", base_sha, head_sha],
+                cwd=self.workspace,
+                check=False,
+            )
+            if diff_result.returncode == 0:
+                log.error(
+                    "Files changed between base and head:\n%s",
+                    diff_result.stdout,
+                )
+
+            # Show merge-base information
+            merge_base_result = run_cmd(
+                ["git", "merge-base", "--is-ancestor", base_sha, head_sha],
+                cwd=self.workspace,
+                check=False,
+            )
+            if merge_base_result.returncode == 0:
+                log.error(
+                    "Base SHA %s is an ancestor of head SHA %s",
+                    base_sha[:8],
+                    head_sha[:8],
+                )
+            else:
+                log.error(
+                    "Base SHA %s is NOT an ancestor of head SHA %s",
+                    base_sha[:8],
+                    head_sha[:8],
+                )
+
+            # Show current repository state
+            status_result = run_cmd(
+                ["git", "status", "--porcelain"],
+                cwd=self.workspace,
+                check=False,
+            )
+            if status_result.stdout.strip():
+                log.error(
+                    "Repository has uncommitted changes:\n%s",
+                    status_result.stdout,
+                )
+
+            # Show current branch and HEAD
+            branch_result = run_cmd(
+                ["git", "branch", "--show-current"],
+                cwd=self.workspace,
+                check=False,
+            )
+            if branch_result.returncode == 0:
+                log.error("Current branch: %s", branch_result.stdout.strip())
+
+            head_result = run_cmd(
+                ["git", "rev-parse", "HEAD"], cwd=self.workspace, check=False
+            )
+            if head_result.returncode == 0:
+                log.error("Current HEAD: %s", head_result.stdout.strip())
+
+        except Exception:
+            log.exception("Failed to gather debug context")
+
+        log.error("=== End verbose merge failure analysis ===")
+
 
 # ---------------------
 # Utility functions

{github2gerrit-0.1.15.dist-info → github2gerrit-0.1.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: github2gerrit
-Version: 0.1.15
+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.15.dist-info → github2gerrit-0.1.16.dist-info}/RECORD

@@ -1,8 +1,8 @@
 github2gerrit/__init__.py,sha256=N1Vj1HJ28LKCJLAynQdm5jFGQQAz9YSMzZhEfvbBgow,886
-github2gerrit/cli.py,sha256=t0jR0bN_EGtqzSguFyWdCzvCXvBBHQZQhqBddUnLHyk,65769
+github2gerrit/cli.py,sha256=edQGODSo0A1RfvO0C7zAjWwIZCnt4RT67BnJwgL0MAY,67843
 github2gerrit/commit_normalization.py,sha256=5HqUJ7p3WQzUYNTkganIsu82aW1wZrh7J7ivQvdCYXw,17033
 github2gerrit/config.py,sha256=khuXAfmOc2wqO4r1Cpp8PYk04AO-JpmnJvSWQZ3fdL8,22315
-github2gerrit/core.py,sha256=ScUS29VeyjGB6Ha3omnk495eLsHXBsz-ROmAbVqVQBo,162943
+github2gerrit/core.py,sha256=hf7XDZ83PD_dYu79u-9u_pboDqu_iL9TpdIaa64_q-0,172360
 github2gerrit/duplicate_detection.py,sha256=HSL1IpyfPk0yLkzCKA8mWadYB3qENR6Ar3AfiH59lCI,28766
 github2gerrit/external_api.py,sha256=9483kkgIs1ECOl_f0lcGb8GrJQF9IfYmWfBQwUJT9hk,18480
 github2gerrit/gerrit_query.py,sha256=7AR9UEwZxtTb9V-l17UDdtWvlvROlnIeJVMa57ilf6s,8343
@@ -24,8 +24,8 @@ github2gerrit/trailers.py,sha256=9w0vIxPNBNQp56sIy-MF62d22Rm6vY-msh9ao1lX0rQ,838
 github2gerrit/utils.py,sha256=1CKTsQo_FO3eyVjzNUT3XyFnyObIxyEFLeSmVKzavVo,3397
 github2gerrit/orchestrator/__init__.py,sha256=HAEcdCAHOFr8LsdIwAdcIcFZn_ayMbX9rdVUULp8410,864
 github2gerrit/orchestrator/reconciliation.py,sha256=qLhmjnIblSa_PVmBblWJ1gSvJ6Gto2AIVOVdYvT6zbk,18364
-github2gerrit-0.1.15.dist-info/METADATA,sha256=1q7uAI2-erRFQNi23SQq64aYQVUa6Khj426xUKqWhK0,33833
-github2gerrit-0.1.15.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-github2gerrit-0.1.15.dist-info/entry_points.txt,sha256=MxN2_liIKo3-xJwtAulAeS5GcOS6JS96nvwOQIkP3W8,56
-github2gerrit-0.1.15.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-github2gerrit-0.1.15.dist-info/RECORD,,
+github2gerrit-0.1.16.dist-info/METADATA,sha256=02ry4GJBvmh4lqF27joxLA_s9be7UqOv95-89plq_fQ,33833
+github2gerrit-0.1.16.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+github2gerrit-0.1.16.dist-info/entry_points.txt,sha256=MxN2_liIKo3-xJwtAulAeS5GcOS6JS96nvwOQIkP3W8,56
+github2gerrit-0.1.16.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+github2gerrit-0.1.16.dist-info/RECORD,,