Do not create a PR if one exists

pablogsal · pablogsal · commit ed1603433a1f · 2024-10-10T23:42:45.000+01:00
Signed-off-by: Pablo Galindo &lt;pablogsal@gmail.com&gt;
diff --git a/buildbothammer/README.md b/buildbothammer/README.md
@@ -60,4 +60,4 @@ The script will:
 - `REPO_OWNER`: The owner of the main repository (default: "python")
 - `REPO_NAME`: The name of the repository (default: "cpython")
 - `FORK_OWNER`: Your GitHub username (default: "$REPO_OWNER")
-- `REPO_CLONE_DIR`: The directory for the local clone of the repository
+- `REPO_CLONE_PATH`: The directory for the local clone of the repository
diff --git a/buildbothammer/src/buildbothammer/__init__.py b/buildbothammer/src/buildbothammer/__init__.py
@@ -197,13 +197,31 @@ def ensure_repo_clone():
         run_command(["git", "reset", "--hard", "origin/main"], cwd=str(REPO_CLONE_DIR))
 
 
+def check_existing_pr(repo, branch_name):
+    logger.info(f"Checking for existing PR for branch: {branch_name}")
+    existing_prs = repo.get_pulls(state='open', head=f"{FORK_OWNER}:{branch_name}")
+    return next(existing_prs, None)
+
+
 def create_revert_pr(commit_sha, builder, failing_build):
     logger.info(f"Creating revert PR for commit: {commit_sha}")
     g = Github(GITHUB_TOKEN)
 
     try:
         main_repo = g.get_repo(f"{REPO_OWNER}/{REPO_NAME}")
 
+        branch_name = f"revert-{commit_sha[:7]}"
+        
+        # Check for existing PR
+        existing_pr = check_existing_pr(main_repo, branch_name)
+        if existing_pr:
+            logger.info(f"Existing PR found: {existing_pr.html_url}")
+            return None, None
+
+        with FileLock(LOCK_FILE):
+            ensure_repo_clone()
+
+
         with FileLock(LOCK_FILE):
             ensure_repo_clone()
 
@@ -215,7 +233,6 @@ def create_revert_pr(commit_sha, builder, failing_build):
                 cwd=str(REPO_CLONE_DIR),
             )
 
-            branch_name = f"revert-{commit_sha[:7]}"
             run_command(["git", "checkout", "-b", branch_name], cwd=str(REPO_CLONE_DIR))
             logger.info(f"Created and checked out new branch: {branch_name}")
 
@@ -322,7 +339,7 @@ async def process_builder(session, builder, first_failing_build):
             pr_url, discord_message = create_revert_pr(
                 commit_sha, builder, first_failing_build
             )
-            if pr_url:
+            if pr_url and discord_message:
                 logger.info(f"Created revert PR for commit {commit_sha}: {pr_url}")
                 await send_discord_notification(session, discord_message)
             else:
