Fail if retcode is not zero after push

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 2011 matching lines @@
       retcode, output = RunGitWithCode(['svn', 'dcommit',
                                         '-C%s' % options.similarity,
                                         '--no-rebase', '--rmdir'])
   finally:
     # And then swap back to the original branch and clean up.
     RunGit(['checkout', '-q', cl.GetBranch()])
     RunGit(['branch', '-D', MERGE_BRANCH])
     if base_has_submodules:
       RunGit(['branch', '-D', CHERRY_PICK_BRANCH])
 
-  if retcode == 0 and pushed_to_pending:
+  if retcode != 0:
+    print 'Failed to push. If this persists, please file a bug.'
+    return retcode
+
+  if pushed_to_pending:
     try:
       revision = WaitForRealCommit(remote, revision, base_branch, branch)
       # We set pushed_to_pending to False, since it made it all the way to the
       # real ref.
       pushed_to_pending = False
     except KeyboardInterrupt:
       pass
 
   if cl.GetIssue():
     if not revision:
       if cmd == 'dcommit' and 'Committed r' in output:
         revision = re.match(
           '.*?\nCommitted r(\\d+)', output, re.DOTALL).group(1)
-      elif cmd == 'land' and retcode == 0:
+      elif cmd == 'land':
         match = (re.match(r'.*?([a-f0-9]{7,})\.\.([a-f0-9]{7,})$', l)
                  for l in output.splitlines(False))
         match = filter(None, match)
         if len(match) != 1:
           DieWithError(
             "Couldn't parse ouput to extract the committed hash:\n%s" % output)
         revision = match[0].group(2)
       else:
         return 1
 
@@ skipping 15 matching lines @@
     patch_num = len(props['patchsets'])
     comment = "Committed patchset #%d (id:%d)%s manually as %s" % (
         patch_num, props['patchsets'][-1], to_pending, revision)
     if options.bypass_hooks:
       comment += ' (tree was closed).' if GetTreeStatus() == 'closed' else '.'
     else:
       comment += ' (presubmit successful).'
     cl.RpcServer().add_comment(cl.GetIssue(), comment)
     cl.SetIssue(None)
 
-  if pushed_to_pending and retcode == 0:
+  if pushed_to_pending:
     _, branch = cl.FetchUpstreamTuple(cl.GetBranch())
     print 'The commit is in the pending queue (%s).' % pending_ref
     print (
         'It will show up on %s in ~1 min, once it gets Cr-Commit-Position '
         'footer.' % branch)
 
-  if retcode == 0:
-    hook = POSTUPSTREAM_HOOK_PATTERN % cmd
-    if os.path.isfile(hook):
-      RunCommand([hook, merge_base], error_ok=True)
+  hook = POSTUPSTREAM_HOOK_PATTERN % cmd
+  if os.path.isfile(hook):
+    RunCommand([hook, merge_base], error_ok=True)
 
   return 0
 
 
 def WaitForRealCommit(remote, pushed_commit, local_base_ref, real_ref):
   print
   print 'Waiting for commit to be landed on %s...' % real_ref
   print '(If you are impatient, you may Ctrl-C once without harm)'
   target_tree = RunGit(['rev-parse', '%s:' % pushed_commit]).strip()
   current_rev = RunGit(['rev-parse', local_base_ref]).strip()
@@ skipping 704 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:]))