|
@@ -428,14 +428,22 @@ class Project(object):
|
|
|
if branch in pubed and pubed[branch] == id:
|
|
if branch in pubed and pubed[branch] == id:
|
|
|
continue
|
|
continue
|
|
|
|
|
|
|
|
- branch = self.GetBranch(branch)
|
|
|
|
|
- base = branch.LocalMerge
|
|
|
|
|
- if branch.LocalMerge:
|
|
|
|
|
- rb = ReviewableBranch(self, branch, base)
|
|
|
|
|
- if rb.commits:
|
|
|
|
|
- ready.append(rb)
|
|
|
|
|
|
|
+ rb = self.GetUploadableBranch(branch)
|
|
|
|
|
+ if rb:
|
|
|
|
|
+ ready.append(rb)
|
|
|
return ready
|
|
return ready
|
|
|
|
|
|
|
|
|
|
+ def GetUploadableBranch(self, branch_name):
|
|
|
|
|
+ """Get a single uploadable branch, or None.
|
|
|
|
|
+ """
|
|
|
|
|
+ branch = self.GetBranch(branch_name)
|
|
|
|
|
+ base = branch.LocalMerge
|
|
|
|
|
+ if branch.LocalMerge:
|
|
|
|
|
+ rb = ReviewableBranch(self, branch, base)
|
|
|
|
|
+ if rb.commits:
|
|
|
|
|
+ return rb
|
|
|
|
|
+ return None
|
|
|
|
|
+
|
|
|
def UploadForReview(self, branch=None):
|
|
def UploadForReview(self, branch=None):
|
|
|
"""Uploads the named branch for code review.
|
|
"""Uploads the named branch for code review.
|
|
|
"""
|
|
"""
|