From d246c9723cf6101832859485cf24a6a4dd343851 Mon Sep 17 00:00:00 2001 From: "fischman@chromium.org" Date: Sat, 21 Dec 2013 22:47:38 +0000 Subject: [PATCH] git_cl.py: emit a more helpful message when [git try] should be used instead of [git cl try]. BUG=330321 Review URL: https://codereview.chromium.org/107963005 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@242301 0039d316-1c4b-4281-b951-d872f2087c98 --- git_cl.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/git_cl.py b/git_cl.py index da3808a8b..a360cff37 100755 --- a/git_cl.py +++ b/git_cl.py @@ -2132,10 +2132,15 @@ def CMDtry(parser, args): '\nWARNING Mismatch between local config and server. Did a previous ' 'upload fail?\ngit-cl try always uses latest patchset from rietveld. ' 'Continuing using\npatchset %s.\n' % patchset) - - cl.RpcServer().trigger_try_jobs( - cl.GetIssue(), patchset, options.name, options.clobber, options.revision, - builders_and_tests) + try: + cl.RpcServer().trigger_try_jobs( + cl.GetIssue(), patchset, options.name, options.clobber, + options.revision, builders_and_tests) + except urllib2.HTTPError, e: + if e.code == 404: + print('404 from rietveld; ' + 'did you mean to use "git try" instead of "git cl try"?') + return 1 print('Tried jobs on:') length = max(len(builder) for builder in builders_and_tests) for builder in sorted(builders_and_tests):