commit d9de945d8a7842cdb470ee07ee44d692ff5297b5
author David Pursehouse <dpursehouse@collab.net> Wed Sep 14 05:20:36 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 14 05:20:36 2016 +0000
tree 840407148d499bec2675249582deb30f27d08140
parent e5c0ea0a959e72ddf6ace9c5a75d86de9e7fc1df
parent 163a3be18b92b9deb0a99795fab7b6ca819f1ecc

Merge "upload: short circuit when nothing is pending"

subcmds/upload.py

diff --git a/subcmds/upload.py b/subcmds/upload.py
index 4b05f1e..1172dad 100644
--- a/subcmds/upload.py
+++ b/subcmds/upload.py
@@ -454,7 +454,11 @@
       if 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,
                       self.manifest.topdir,
                       self.manifest.manifestProject.GetRemote('origin').url,
@@ -474,9 +478,7 @@
       cc = _SplitEmails(opt.cc)
     people = (reviewers, cc)
 
-    if not pending:
-      print("no branches ready for upload", file=sys.stderr)
-    elif len(pending) == 1 and len(pending[0][1]) == 1:
+    if len(pending) == 1 and len(pending[0][1]) == 1:
       self._SingleBranch(opt, pending[0][1][0], people)
     else:
       self._MultipleBranches(opt, pending, people)