Add branch support to repo upload
This commit adds a --br=<branch> option to repo upload.
repo currently examines every non-published branch. This is problematic
for my workflow. I have many branches in my kernel tree. Many of these
branches are based off of upstream remotes (I have many remotes) and
will never be uploaded (they'll get sent upstream as a patch).
Having repo scan these branches adds to my upload processing time
and clutters the branch selection buffer. I've also seen repo get
confused when one of my branches is 1000s of commits different from
m/master.
Change-Id: I68fa18951ea59ba373277b57ffcaf8cddd7e7a40
diff --git a/project.py b/project.py
index 6252bd6..e5dbf25 100644
--- a/project.py
+++ b/project.py
@@ -791,7 +791,7 @@
if R_HEADS + n not in heads:
self.bare_git.DeleteRef(name, id)
- def GetUploadableBranches(self):
+ def GetUploadableBranches(self, selected_branch=None):
"""List any branches which can be uploaded for review.
"""
heads = {}
@@ -807,6 +807,8 @@
for branch, id in heads.iteritems():
if branch in pubed and pubed[branch] == id:
continue
+ if selected_branch and branch != selected_branch:
+ continue
rb = self.GetUploadableBranch(branch)
if rb:
diff --git a/subcmds/upload.py b/subcmds/upload.py
index c561b8a..c195837 100644
--- a/subcmds/upload.py
+++ b/subcmds/upload.py
@@ -120,6 +120,9 @@
p.add_option('--cc',
type='string', action='append', dest='cc',
help='Also send email to these email addresses.')
+ p.add_option('--br',
+ type='string', action='store', dest='branch',
+ help='Branch to upload.')
# Options relating to upload hook. Note that verify and no-verify are NOT
# opposites of each other, which is why they store to different locations.
@@ -336,9 +339,13 @@
pending = []
reviewers = []
cc = []
+ branch = None
+
+ if opt.branch:
+ branch = opt.branch
for project in project_list:
- avail = project.GetUploadableBranches()
+ avail = project.GetUploadableBranches(branch)
if avail:
pending.append((project, avail))
