github2gerrit 0.1.16__tar.gz → 0.1.17__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: github2gerrit
-Version: 0.1.16
+Version: 0.1.17
 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.16 → github2gerrit-0.1.17}/src/github2gerrit/core.py

@@ -1749,6 +1749,10 @@ class Orchestrator:
     ) -> None:
         """Set git global config and initialize git-review if needed."""
         log.debug("Configuring git and git-review for %s", gerrit.host)
+
+        # Configure git user identity (required for merge operations)
+        self._ensure_git_user_identity(inputs)
+
         # Prefer repo-local config; fallback to global if needed
         try:
             git_config(
@@ -1761,26 +1765,7 @@ class Orchestrator:
             git_config(
                 "gitreview.username", inputs.gerrit_ssh_user_g2g, global_=True
             )
-        try:
-            git_config(
-                "user.name",
-                inputs.gerrit_ssh_user_g2g,
-                global_=False,
-                cwd=self.workspace,
-            )
-        except GitError:
-            git_config("user.name", inputs.gerrit_ssh_user_g2g, global_=True)
-        try:
-            git_config(
-                "user.email",
-                inputs.gerrit_ssh_user_g2g_email,
-                global_=False,
-                cwd=self.workspace,
-            )
-        except GitError:
-            git_config(
-                "user.email", inputs.gerrit_ssh_user_g2g_email, global_=True
-            )
+        # Git user identity is configured by _ensure_git_user_identity
         # Disable GPG signing to avoid interactive prompts for signing keys
         try:
             git_config(
@@ -4386,7 +4371,15 @@ class Orchestrator:
         """Suggest recovery actions based on merge failure analysis."""
         stderr = (merge_exc.stderr or "").lower()
 
-        if "conflict" in stderr:
+        if (
+            "committer identity unknown" in stderr
+            or "empty ident name" in stderr
+        ):
+            return (
+                "Git user identity not configured - this should be handled "
+                "automatically by the tool. Please report this as a bug."
+            )
+        elif "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 (
@@ -4516,6 +4509,67 @@ class Orchestrator:
 
         log.error("=== End verbose merge failure analysis ===")
 
+    def _ensure_git_user_identity(self, inputs: Inputs) -> None:
+        """Ensure git user identity is configured for merge operations."""
+        log.debug("Ensuring git user identity is configured")
+
+        # Check if user.name and user.email are already configured
+        try:
+            name_result = run_cmd(
+                ["git", "config", "user.name"], cwd=self.workspace, check=False
+            )
+            email_result = run_cmd(
+                ["git", "config", "user.email"], cwd=self.workspace, check=False
+            )
+
+            if (
+                name_result.returncode == 0
+                and name_result.stdout.strip()
+                and email_result.returncode == 0
+                and email_result.stdout.strip()
+            ):
+                log.debug(
+                    "Git user identity already configured: %s <%s>",
+                    name_result.stdout.strip(),
+                    email_result.stdout.strip(),
+                )
+                return
+
+        except Exception as e:
+            log.debug("Failed to check existing git identity: %s", e)
+
+        # Configure git identity using Gerrit credentials
+        user_name = inputs.gerrit_ssh_user_g2g or "github2gerrit-bot"
+        user_email = (
+            inputs.gerrit_ssh_user_g2g_email or "github2gerrit@example.com"
+        )
+
+        log.debug("Configuring git identity: %s <%s>", user_name, user_email)
+
+        try:
+            # Set local repository identity
+            run_cmd(
+                ["git", "config", "user.name", user_name], cwd=self.workspace
+            )
+            run_cmd(
+                ["git", "config", "user.email", user_email], cwd=self.workspace
+            )
+            log.debug("Successfully configured git user identity")
+
+        except CommandError as e:
+            # Fallback to global config if local fails
+            log.warning(
+                "Failed to set local git identity, trying global: %s", e
+            )
+            try:
+                run_cmd(["git", "config", "--global", "user.name", user_name])
+                run_cmd(["git", "config", "--global", "user.email", user_email])
+                log.debug("Successfully configured global git user identity")
+            except CommandError as global_e:
+                log.exception("Failed to configure git user identity")
+                msg = "Cannot configure git user identity"
+                raise OrchestratorError(msg) from global_e
+
 
 # ---------------------
 # Utility functions