2197: Make the /backport command support a "repo:branch" argument

Reviewed-by: erikj

Author: zhaosongzs

bots/pr/src/main/java/org/openjdk/skara/bots/pr/BackportCommand.java

@@ -34,6 +34,7 @@
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.time.format.DateTimeFormatter;
@@ -42,11 +43,13 @@
 
 public class BackportCommand implements CommandHandler {
     private void showHelp(PrintWriter reply) {
-        reply.println("Usage: `/backport <repository> [<branch>]`");
+        reply.println("Usage:  `/backport <repository> [<branch>]` " +
+                "or `/backport [<repository>]:<branch>`");
     }
 
     private void showHelpInPR(PrintWriter reply) {
-        reply.println("Usage: `/backport [disable] <repository> [<branch>]`");
+        reply.println("Usage: `/backport [disable] <repository> [<branch>]` " +
+                "or `/backport [disable] [<repository>]:<branch>`");
     }
 
     @Override
@@ -91,6 +94,21 @@ public void handle(PullRequestBot bot, PullRequest pr, CensusInstance censusInst
         }
 
         var parts = args.split(" ");
+
+        // Preprocess args to support "repo:branch" argument
+        if (parts[0].equals("disable")) {
+            if (parts.length == 2 && parts[1].contains(":")) {
+                List<String> tempList = new ArrayList<>();
+                tempList.add("disable");
+                tempList.addAll(Arrays.asList(parts[1].split(":")));
+                parts = tempList.toArray(new String[0]);
+            }
+        } else {
+            if (parts.length == 1 && parts[0].contains(":")) {
+                parts = parts[0].split(":");
+            }
+        }
+
         boolean argIsValid = parts[0].equals("disable") ? parts.length == 2 || parts.length == 3 : parts.length <= 2;
         if (!argIsValid) {
             showHelpInPR(reply);
@@ -158,6 +176,9 @@ private String generateBackportLabel(String targetRepo, String targetBranchName)
 
     private HostedRepository getTargetRepo(PullRequestBot bot, String repoName, PrintWriter reply) {
         var forge = bot.repo().forge();
+        if (repoName.isEmpty()) {
+            repoName = bot.repo().name();
+        }
         var repoNameArg = repoName.replace("http://", "")
                 .replace("https://", "")
                 .replace(forge.hostname() + "/", "");
@@ -212,6 +233,11 @@ public void handle(PullRequestBot bot, HostedCommit commit, LimitedCensusInstanc
             return;
         }
 
+        // Preprocess args to support "repo:branch" argument
+        if (parts.length == 1 && parts[0].contains(":")) {
+            parts = parts[0].split(":");
+        }
+
         // Get target repo
         var targetRepo = getTargetRepo(bot, parts[0], reply);
         if (targetRepo == null) {

bots/pr/src/test/java/org/openjdk/skara/bots/pr/BackportCommitCommandTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -77,6 +77,24 @@ void simple(TestInfo testInfo) throws IOException {
             assertTrue(botReply.body().contains("with this backport"));
             assertTrue(botReply.body().contains("@" + botReply.author().username()));
             assertEquals(botReply.body().indexOf("@" + botReply.author().username()), botReply.body().lastIndexOf("@" + botReply.author().username()));
+
+            // Add a backport command
+            author.addCommitComment(editHash, "/backport " + author.name() + ":" + author.defaultBranchName());
+            TestBotRunner.runPeriodicItems(bot);
+            recentCommitComments = author.recentCommitComments();
+            assertEquals(4, recentCommitComments.size());
+            botReply = recentCommitComments.get(0);
+            assertTrue(botReply.body().contains("To create a pull request with this backport targeting " +
+                    "[" + author.name() + ":" + author.defaultBranchName() + "]"));
+
+            // Add a backport command
+            author.addCommitComment(editHash, "/backport :" + author.defaultBranchName());
+            TestBotRunner.runPeriodicItems(bot);
+            recentCommitComments = author.recentCommitComments();
+            assertEquals(6, recentCommitComments.size());
+            botReply = recentCommitComments.get(0);
+            assertTrue(botReply.body().contains("To create a pull request with this backport targeting " +
+                    "[" + author.name() + ":" + author.defaultBranchName() + "]"));
         }
     }
 

bots/pr/src/test/java/org/openjdk/skara/bots/pr/BackportPRCommandTests.java

@@ -54,7 +54,7 @@ void simple(TestInfo testInfo) throws IOException {
                     .repo(bot)
                     .censusRepo(censusBuilder.build())
                     .seedStorage(seedFolder)
-                    .forks(Map.of("targetRepo", targetRepo, "targetRepo2", targetRepo2))
+                    .forks(Map.of("targetRepo", targetRepo, "targetRepo2", targetRepo2, "test", author))
                     .build();
 
             // Populate the projects repository
@@ -89,13 +89,25 @@ void simple(TestInfo testInfo) throws IOException {
             assertLastCommentContains(pr, "Backport for repo `targetRepo2` on branch `dev` was successfully enabled");
             assertTrue(pr.store().labelNames().contains("backport=targetRepo2:dev"));
 
-            // disable backport for targetRepo on master
+            // Enable backport for test on master
+            pr.addComment("/backport :master");
+            TestBotRunner.runPeriodicItems(prBot);
+            assertLastCommentContains(pr, "Backport for repo `test` on branch `master` was successfully enabled");
+            assertTrue(pr.store().labelNames().contains("backport=test:master"));
+
+            // Disable backport for test on master
+            pr.addComment("/backport disable test:master");
+            TestBotRunner.runPeriodicItems(prBot);
+            assertLastCommentContains(pr, "Backport for repo `test` on branch `master` was successfully disabled");
+            assertFalse(pr.store().labelNames().contains("backport=test:master"));
+
+            // Disable backport for targetRepo on master
             reviewerPr.addComment("/backport disable targetRepo");
             TestBotRunner.runPeriodicItems(prBot);
             assertLastCommentContains(pr, "Backport for repo `targetRepo` on branch `master` was successfully disabled.");
             assertFalse(pr.store().labelNames().contains("backport=targetRepo:master"));
 
-            // disable backport for targetRepo again
+            // Disable backport for targetRepo again
             reviewerPr.addComment("/backport disable targetRepo");
             TestBotRunner.runPeriodicItems(prBot);
             assertLastCommentContains(pr, "Backport for repo `targetRepo` on branch `master` was already disabled.");
@@ -165,7 +177,7 @@ void testBackportCommandWhenPrIsClosed(TestInfo testInfo) throws IOException {
 
             TestBotRunner.runPeriodicItems(prBot);
 
-            //close the pr
+            // Close the pr
             pr.store().setState(Issue.State.CLOSED);
             pr.addComment("/backport targetRepo");
             TestBotRunner.runPeriodicItems(prBot);