From 7a753b8b181a26b1980349cb2223d9cb010d3099 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 19 Feb 2020 00:14:32 -0500 Subject: [PATCH] upload: improve no pending CL error handling Show clearer messages and exit non-zero if there's nothing to upload. Change-Id: Icd9c13b9b1126610a409fc13d1d11bfc66f5e802 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/255834 Reviewed-by: David Pursehouse Tested-by: Mike Frysinger --- subcmds/upload.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/subcmds/upload.py b/subcmds/upload.py index ba75a53..91bec6f 100644 --- a/subcmds/upload.py +++ b/subcmds/upload.py @@ -486,8 +486,12 @@ Gerrit Code Review: https://www.gerritcodereview.com/ pending.append((project, avail)) if not pending: - print("no branches ready for upload", file=sys.stderr) - return + if branch is None: + print('repo: error: no branches ready for upload', file=sys.stderr) + else: + print('repo: error: no branches named "%s" ready for upload' % + (branch,), file=sys.stderr) + return 1 if not opt.bypass_hooks: hook = RepoHook('pre-upload', self.manifest.repo_hooks_project,