commit e74d9046eeec52d7ccd433a4dad2cee30838c620
author Aravind Vasudevan <aravindvasudev@google.com> Fri Mar 24 04:16:35 2023 +0000
committer LUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Mar 24 07:39:28 2023 +0000
tree 58f47cfc65ffab5641e8d3f275919c33bde3ddc8
parent 21cc3a9d53d3ab1f3de5b900ad7bb4969326994d

Update abandon to support multiple branches

This change updates `repo abandon` command to take multiple space-separated branchnames as parameters.

Bug: https://crbug.com/gerrit/13354
Change-Id: I00ad7a79872c0e4161f8183843835f25cd515605
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/365524
Tested-by: Aravind Vasudevan <aravindvasudev@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
Commit-Queue: Aravind Vasudevan <aravindvasudev@google.com>

subcmds/abandon.py

diff --git a/subcmds/abandon.py b/subcmds/abandon.py
index 1f687f5..4036f30 100644
--- a/subcmds/abandon.py
+++ b/subcmds/abandon.py
@@ -48,9 +48,15 @@
             self.Usage()
 
         if not opt.all:
-            nb = args[0]
-            if not git.check_ref_format("heads/%s" % nb):
-                self.OptionParser.error("'%s' is not a valid branch name" % nb)
+            branches = args[0].split()
+            invalid_branches = [
+                x for x in branches if not git.check_ref_format(f"heads/{x}")
+            ]
+
+            if invalid_branches:
+                self.OptionParser.error(
+                    f"{invalid_branches} are not valid branch names"
+                )
         else:
             args.insert(0, "'All local branches'")
 
@@ -59,7 +65,7 @@
         if all_branches:
             branches = project.GetBranches()
         else:
-            branches = [nb]
+            branches = nb
 
         ret = {}
         for name in branches:
@@ -69,7 +75,7 @@
         return (ret, project)
 
     def Execute(self, opt, args):
-        nb = args[0]
+        nb = args[0].split()
         err = defaultdict(list)
         success = defaultdict(list)
         all_projects = self.GetProjects(