Add git number footer generation to git cl land.

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 and Gerrit."""
 
 from __future__ import print_function
@@ skipping 4168 matching lines @@
     if base_has_submodules:
       cherry_pick_commit = RunGit(['rev-list', 'HEAD^!']).rstrip()
       RunGit(['branch', CHERRY_PICK_BRANCH, svn_head])
       RunGit(['checkout', CHERRY_PICK_BRANCH])
       RunGit(['cherry-pick', cherry_pick_commit])
     if cmd == 'land':
       remote, branch = cl.FetchUpstreamTuple(cl.GetBranch())
       mirror = settings.GetGitMirror(remote)
       pushurl = mirror.url if mirror else remote
       pending_prefix = settings.GetPendingRefPrefix()
-      if not pending_prefix or branch.startswith(pending_prefix):
+      git_number_footer = settings.GetHasGitNumberFooter()
+      # NOTE: that pending_prefix takes precendence over git_number_footer.
+      #   If pending_prefix is set, it means gnumbd service is still working
+      #   for this repo OR deve's checkout is stale, in which case push to
+      #   refs/pending/ below fail anyway.
+      if not pending_prefix and git_number_footer:
+        # git_number_footer is used only if pending_prefix is not used.
+        retcode, output = PushToGitWithGitNumberFooter(pushurl, branch)
+        pushed_to_pending = False
+      elif not pending_prefix or branch.startswith(pending_prefix):
         # If not using refs/pending/heads/* at all, or target ref is already set
         # to pending, then push to the target ref directly.
         retcode, output = RunGitWithCode(
             ['push', '--porcelain', pushurl, 'HEAD:%s' % branch])
         pushed_to_pending = pending_prefix and branch.startswith(pending_prefix)
       else:
         # Cherry-pick the change on top of pending ref and then push it.
         assert branch.startswith('refs/'), branch
         assert pending_prefix[-1] == '/', pending_prefix
         pending_ref = pending_prefix + branch[len('refs/'):]
@@ skipping 103 matching lines @@
 
     current_rev = to_rev
 
 
 def PushToGitPending(remote, pending_ref):
   """Fetches pending_ref, cherry-picks current HEAD on top of it, pushes.
 
   Returns:
     (retcode of last operation, output log of last operation).
   """
+  # TODO(tandrii): delete this with gnumbd service, see http://crbug.com/644915.
   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 = ''
   max_attempts = 3
   attempts_left = max_attempts
   while attempts_left:
     if attempts_left != max_attempts:
       print('Retrying, %d attempts left...' % (attempts_left - 1,))
@@ skipping 35 matching lines @@
       print(out.strip())
     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 PushToGitWithGitNumberFooter(remote, upstream_ref):
+  """Fetches remote ref, cherry-picks current HEAD on top of it, updates
+  position footers, pushes.
+
+  Returns:
+    (retcode of last operation, output log of last operation).
+  """
+  local_upstream_ref = 'refs/git-cl/' + upstream_ref[len('refs/'):]
+  cherry = RunGit(['rev-parse', 'HEAD']).strip()
+  code = 0
+  out = ''
+  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...' % upstream_ref)
+    code, out = RunGitWithCode(
+        ['retry', 'fetch', remote, '+%s:%s' % (upstream_ref, local_upstream_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_upstream_ref], suppress_stderr=True)
+    code, out = RunGitWithCode(['cherry-pick', cherry])
+    if code:
+      print('Your patch doesn\'t apply cleanly to ref \'%s\', '
+            'the following files have merge conflicts:' % upstream_ref)
+      print(RunGit(['diff', '--name-status', '--diff-filter=U']).strip())
+      print('Please rebase your patch and try again.')
+      RunGitWithCode(['cherry-pick', '--abort'])
+      return code, out
+
+    # Applied cleanly, amend commit message with position footers.
+
+    # TODO(tandrii): amend footers.
+
+    # Try to push now. Retry on error (flake or non-ff push).
+    print('Pushing commit to %s... It can take a while.' % upstream_ref)
+    code, out = RunGitWithCode(
+        ['retry', 'push', '--porcelain', remote, 'HEAD:%s' % upstream_ref])
+    if code == 0:
+      # Success.
+      print('Commit pushed to pending ref successfully!')
+      return code, out
+
+    print('Push failed with exit code %d.' % code)
+    if out.strip():
+      print(out.strip())
+    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():
     if git_footers.get_footer_svn_id():
@@ skipping 896 matching lines @@
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   setup_color.init()
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)