android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "upload: short circuit when nothing is pending"

Browse Source
This commit is contained in:
David Pursehouse 2016-09-14 05:20:36 +00:00 committed by Gerrit Code Review
commit d9de945d8a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
subcmds/upload.py
View File

@ -454,7 +454,11 @@ Gerrit Code Review: http://code.google.com/p/gerrit/
if avail: if avail:
pending.append((project, avail)) pending.append((project, avail))
if pending and (not opt.bypass_hooks): if not pending:
print("no branches ready for upload", file=sys.stderr)
return
if not opt.bypass_hooks:
hook = RepoHook('pre-upload', self.manifest.repo_hooks_project, hook = RepoHook('pre-upload', self.manifest.repo_hooks_project,
self.manifest.topdir, self.manifest.topdir,
self.manifest.manifestProject.GetRemote('origin').url, self.manifest.manifestProject.GetRemote('origin').url,
@ -474,9 +478,7 @@ Gerrit Code Review: http://code.google.com/p/gerrit/
cc = _SplitEmails(opt.cc) cc = _SplitEmails(opt.cc)
people = (reviewers, cc) people = (reviewers, cc)
if not pending: if len(pending) == 1 and len(pending[0][1]) == 1:
print("no branches ready for upload", file=sys.stderr)
elif len(pending) == 1 and len(pending[0][1]) == 1:
self._SingleBranch(opt, pending[0][1][0], people) self._SingleBranch(opt, pending[0][1][0], people)
else: else:
self._MultipleBranches(opt, pending, people) self._MultipleBranches(opt, pending, people)