commit_and_push: check staged content before commit

...and halt if nothing is staged

Signed-off-by: Tomas Tomecek <[email protected]>
Assisted-by: Cursor(Claude)
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

Author: TomasTomecek

beeai/agents/backport_agent.py

@@ -255,31 +255,37 @@ async def run_build_agent(state):
                 return "run_backport_agent"
 
             async def commit_push_and_open_mr(state):
-                state.merge_request_url = await tasks.commit_push_and_open_mr(
-                    local_clone=state.local_clone,
-                    files_to_commit=["*.spec", f"{state.jira_issue}.patch"],
-                    commit_message=(
-                        f"Fix {state.jira_issue}\n\n"
-                        f"{f'CVE: {state.cve_id}\n' if state.cve_id else ''}"
-                        f"{f'Upstream fix: {state.upstream_fix}\n'}"
-                        f"Resolves: {state.jira_issue}\n\n"
-                        f"This commit was backported {I_AM_JOTNAR}\n\n"
-                        f"Assisted-by: Jotnar\n"
-                    ),
-                    fork_url=state.fork_url,
-                    dist_git_branch=state.dist_git_branch,
-                    update_branch=state.update_branch,
-                    mr_title=f"Resolves {state.jira_issue}",
-                    mr_description=(
-                        f"This merge request was created {I_AM_JOTNAR}\n"
-                        f"{CAREFULLY_REVIEW_CHANGES}\n\n"
-                        f"Upstream patch: {state.upstream_fix}\n\n"
-                        "Backporting steps:\n\n"
-                        f"{state.backport_result.status}"
-                    ),
-                    available_tools=gateway_tools,
-                    commit_only=dry_run,
-                )
+                try:
+                    state.merge_request_url = await tasks.commit_push_and_open_mr(
+                        local_clone=state.local_clone,
+                        files_to_commit=["*.spec", f"{state.jira_issue}.patch"],
+                        commit_message=(
+                            f"Fix {state.jira_issue}\n\n"
+                            f"{f'CVE: {state.cve_id}\n' if state.cve_id else ''}"
+                            f"{f'Upstream fix: {state.upstream_fix}\n'}"
+                            f"Resolves: {state.jira_issue}\n\n"
+                            f"This commit was backported {I_AM_JOTNAR}\n\n"
+                            f"Assisted-by: Jotnar\n"
+                        ),
+                        fork_url=state.fork_url,
+                        dist_git_branch=state.dist_git_branch,
+                        update_branch=state.update_branch,
+                        mr_title=f"Resolves {state.jira_issue}",
+                        mr_description=(
+                            f"This merge request was created {I_AM_JOTNAR}\n"
+                            f"{CAREFULLY_REVIEW_CHANGES}\n\n"
+                            f"Upstream patch: {state.upstream_fix}\n\n"
+                            "Backporting steps:\n\n"
+                            f"{state.backport_result.status}"
+                        ),
+                        available_tools=gateway_tools,
+                        commit_only=dry_run,
+                    )
+                except Exception as e:
+                    logger.warning(f"Error committing and opening MR: {e}")
+                    state.merge_request_url = None
+                    state.backport_result.success = False
+                    state.backport_result.error = f"Could not commit and open MR: {e}"
                 return "comment_in_jira"
 
             async def comment_in_jira(state):

beeai/agents/rebase_agent.py

@@ -256,29 +256,35 @@ async def commit_push_and_open_mr(state):
                 # Use files specified by rebase agent, fallback to *.spec if none specified
                 files_to_git_add = state.rebase_result.files_to_git_add or ["*.spec"]
 
-                state.merge_request_url = await tasks.commit_push_and_open_mr(
-                    local_clone=state.local_clone,
-                    files_to_commit=files_to_git_add,
-                    commit_message=(
-                        f"Rebase to version {state.version}\n\n"
-                        f"Resolves: {state.jira_issue}\n\n"
-                        f"This commit was created {I_AM_JOTNAR}\n\n"
-                        f"Assisted-by: Jotnar\n"
-                    ),
-                    fork_url=state.fork_url,
-                    dist_git_branch=state.dist_git_branch,
-                    update_branch=state.update_branch,
-                    mr_title=f"Update to version {state.version}",
-                    mr_description=(
-                        f"This merge request was created {I_AM_JOTNAR}\n"
-                        f"{CAREFULLY_REVIEW_CHANGES}\n\n"
-                        f"Resolves: {state.jira_issue}\n\n"
-                        "Status of the rebase:\n\n"
-                        f"{state.rebase_result.status}"
-                    ),
-                    available_tools=gateway_tools,
-                    commit_only=dry_run,
-                )
+                try:
+                    state.merge_request_url = await tasks.commit_push_and_open_mr(
+                        local_clone=state.local_clone,
+                        files_to_commit=files_to_git_add,
+                        commit_message=(
+                            f"Rebase to version {state.version}\n\n"
+                            f"Resolves: {state.jira_issue}\n\n"
+                            f"This commit was created {I_AM_JOTNAR}\n\n"
+                            f"Assisted-by: Jotnar\n"
+                        ),
+                        fork_url=state.fork_url,
+                        dist_git_branch=state.dist_git_branch,
+                        update_branch=state.update_branch,
+                        mr_title=f"Update to version {state.version}",
+                        mr_description=(
+                            f"This merge request was created {I_AM_JOTNAR}\n"
+                            f"{CAREFULLY_REVIEW_CHANGES}\n\n"
+                            f"Resolves: {state.jira_issue}\n\n"
+                            "Status of the rebase:\n\n"
+                            f"{state.rebase_result.status}"
+                        ),
+                        available_tools=gateway_tools,
+                        commit_only=dry_run,
+                    )
+                except Exception as e:
+                    logger.warning(f"Error committing and opening MR: {e}")
+                    state.merge_request_url = None
+                    state.rebase_result.success = False
+                    state.rebase_result.error = f"Could not commit and open MR: {e}"
                 return "comment_in_jira"
 
             async def comment_in_jira(state):

beeai/agents/tasks.py

@@ -9,7 +9,7 @@
 
 from common.utils import is_cs_branch
 from constants import BRANCH_PREFIX, JIRA_COMMENT_TEMPLATE, JiraLabels
-from utils import check_subprocess, run_tool, mcp_tools
+from utils import check_subprocess, run_subprocess, run_tool, mcp_tools
 
 logger = logging.getLogger(__name__)
 
@@ -69,7 +69,15 @@ async def commit_push_and_open_mr(
         files_to_commit = [files_to_commit]
     for path in itertools.chain(*(local_clone.glob(pat) for pat in files_to_commit)):
         await check_subprocess(["git", "add", str(path)], cwd=local_clone)
-    # TODO: check for empty commit (the command below will fail anyway, but we need to handle this somehow)
+    # Check if any files are staged before committing, if none, bail
+    exit_code, _, _ = await run_subprocess(
+        ["git", "diff", "--cached", "--quiet"],
+        cwd=local_clone,
+    )
+    # 1 = staged, 0 = none staged
+    if exit_code == 0:
+        logger.info("No files staged for commit, halting.")
+        raise RuntimeError("No files staged for commit, halting.")
     await check_subprocess(["git", "commit", "-m", commit_message], cwd=local_clone)
     if commit_only:
         return None

beeai/agents/utils.py

@@ -40,6 +40,7 @@ async def run_subprocess(
     cwd: Path | None = None,
     env: dict[str, str] | None = None,
 ) -> Tuple[int, str | None, str | None]:
+    """Run a subprocess and return the exit code, stdout, and stderr."""
     kwargs = {
         "stdout": asyncio.subprocess.PIPE,
         "stderr": asyncio.subprocess.PIPE,