Be verbose about what's happening in 'git cl land' when pusing to pending ref.

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld."""
 
 from distutils.version import LooseVersion
@@ skipping 2070 matching lines @@
   """Fetches pending_ref, cherry-picks current HEAD on top of it, pushes.
 
   Returns:
     (retcode of last operation, output log of last operation).
   """
   assert pending_ref.startswith('refs/'), pending_ref
   local_pending_ref = 'refs/git-cl/' + pending_ref[len('refs/'):]
   cherry = RunGit(['rev-parse', 'HEAD']).strip()
   code = 0
   out = ''
-  attempt = 0
-  while attempt < 5:
-    attempt += 1
+  max_attempts = 3
+  attempts_left = max_attempts
+  while attempts_left:
+    if attempts_left != max_attempts:
+      print 'Retrying, %d attempts left...' % (attempts_left - 1,)
+    attempts_left -= 1
 
     # Fetch. Retry fetch errors.
+    print 'Fetching pending ref %s...' % pending_ref
     code, out = RunGitWithCode(
-        ['retry', 'fetch', remote, '+%s:%s' % (pending_ref, local_pending_ref)],
-        suppress_stderr=True)
+        ['retry', 'fetch', remote, '+%s:%s' % (pending_ref, local_pending_ref)])
     if code:
+      print 'Fetch failed with exit code %d.' % code
+      if out.strip():
+        print out.strip()
       continue
 
     # Try to cherry pick. Abort on merge conflicts.
+    print 'Cherry-picking commit on top of pending ref...'
     RunGitWithCode(['checkout', local_pending_ref], suppress_stderr=True)
-    code, out = RunGitWithCode(['cherry-pick', cherry], suppress_stderr=True)
+    code, out = RunGitWithCode(['cherry-pick', cherry])
     if code:
       print (
-          'Your patch doesn\'t apply cleanly to upstream ref \'%s\', '
-          'the following files have merge conflicts:' % upstream_ref)
+          'Your patch doesn\'t apply cleanly to ref \'%s\', '
+          'the following files have merge conflicts:' % pending_ref)
       print RunGit(['diff', '--name-status', '--diff-filter=U']).strip()
       print 'Please rebase your patch and try again.'
-      RunGitWithCode(['cherry-pick', '--abort'], suppress_stderr=True)
+      RunGitWithCode(['cherry-pick', '--abort'])
       return code, out
 
     # Applied cleanly, try to push now. Retry on error (flake or non-ff push).
+    print 'Pushing commit to %s... It can take a while.' % pending_ref
     code, out = RunGitWithCode(
         ['retry', 'push', '--porcelain', remote, 'HEAD:%s' % pending_ref])
     if code == 0:
       # Success.
       return code, out
 
+    print 'Push failed with exit code %d.' % code
+    if out.strip():
+      print out.strip()

[Vadim Sh., 2014/08/26 21:12:05]

that was the most crucial missing part, for whatever mysterious reason git push
reports details of push error to stdout, not stderr. 

+    if IsFatalPushFailure(out):
+      print (
+          'Fatal push error. Make sure your .netrc credentials and git '
+          'user.email are correct and you have push access to the repo.')
+      return code, out
+
+  print 'All attempts to push to pending ref failed.'
   return code, out
 
 
+def IsFatalPushFailure(push_stdout):
+  """True if retrying push won't help."""
+  return '(prohibited by Gerrit)' in push_stdout
+
+
 @subcommand.usage('[upstream branch to apply against]')
 def CMDdcommit(parser, args):
   """Commits the current changelist via git-svn."""
   if not settings.GetIsGitSvn():
     message = """This doesn't appear to be an SVN repository.
 If your project has a git mirror with an upstream SVN master, you probably need
 to run 'git svn init', see your project's git mirror documentation.
 If your project has a true writeable upstream repository, you probably want
 to run 'git cl land' instead.
 Choose wisely, if you get this wrong, your commit might appear to succeed but
@@ skipping 608 matching lines @@
         ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
           'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
 
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   colorama.init()
   sys.exit(main(sys.argv[1:]))