commit 3b038cecc4ff189f9f7263adc5f8bf1ae62f3380
author Mike Frysinger <vapier@google.com> Sat May 01 00:45:19 2021 -0400
committer Mike Frysinger <vapier@google.com> Sun May 02 00:05:49 2021 +0000
tree 5d23b7568c142e8506543f21b51da85b9681502c
parent a590e640a69b1a6ba448600cbc7f3be31178bc92

upload: include the project in error messages

When running upload across multiple projects, include the project in
any error messages that come up.  This lets users figure out where
the problem might be.

Change-Id: I09470c9a1b512baf910d6d97b747816d1a6f3a87
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/304783
Reviewed-by: Raman Tenneti <rtenneti@google.com>
Tested-by: Mike Frysinger <vapier@google.com>

subcmds/upload.py

diff --git a/subcmds/upload.py b/subcmds/upload.py
index 50dccc5..a23755c 100644
--- a/subcmds/upload.py
+++ b/subcmds/upload.py
@@ -520,10 +520,10 @@
           avail = [up_branch]
         else:
           avail = None
-          print('repo: error: Unable to upload branch "%s". '
+          print('repo: error: %s: Unable to upload branch "%s". '
                 'You might be able to fix the branch by running:\n'
                 '  git branch --set-upstream-to m/%s' %
-                (str(cbr), self.manifest.branch),
+                (project.relpath, str(cbr), self.manifest.branch),
                 file=sys.stderr)
       else:
         avail = project.GetUploadableBranches(branch)