commit d4dfff088c81b4c02c017f34a742120fc815506c
author Joanna Wang <jojwang@google.com> Wed Sep 13 17:44:31 2023 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Sep 13 17:44:31 2023 +0000
tree 793c10163e7753da0fef6a903b7c8b45c7e6586f
parent bcba1782123e426901b0e436edf1c444ae5aeb70

Fix missing upstream messaging.

Bug: 1455494
Change-Id: Ie428c228d4a3fe2db1f95dbb9c642034de9eec79
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4858989
Reviewed-by: Gavin Mak <gavinmak@google.com>
Auto-Submit: Joanna Wang <jojwang@chromium.org>
Commit-Queue: Gavin Mak <gavinmak@google.com>

git_cl.py

diff --git a/git_cl.py b/git_cl.py
index c4789df..fb701ba 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -1417,8 +1417,9 @@
         upstream_branch = self.GetUpstreamBranch()
         if not scm.GIT.IsValidRevision(settings.GetRoot(), upstream_branch):
             DieWithError(
-                'The upstream for the current branch (%s) does not exist '
-                'anymore.\nPlease fix it and try again.' % self.GetBranch())
+                'The current branch (%s) has an upstream (%s) that does not exist '
+                'anymore.\nPlease fix it and try again.' %
+                (self.GetBranch(), upstream_branch))
         return git_common.get_or_create_merge_base(self.GetBranch(),
                                                    upstream_branch)