Use full hash in Committed link when closing issue via git-cl.

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 1996 matching lines @@
         # to pending, then push to the target ref directly.
         retcode, output = RunGitWithCode(
             ['push', '--porcelain', remote, '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/'):]
         retcode, output = PushToGitPending(remote, pending_ref, branch)
+        pushed_to_pending = (retcode == 0)
+      if retcode == 0:
         revision = RunGit(['rev-parse', 'HEAD']).strip()
-        pushed_to_pending = (retcode == 0)
-      logging.debug(output)
     else:
       # dcommit the merge branch.
-      retcode, output = RunGitWithCode(['svn', 'dcommit',
-                                        '-C%s' % options.similarity,
-                                        '--no-rebase', '--rmdir'])
+      _, output = RunGitWithCode(['svn', 'dcommit',
+                                  '-C%s' % options.similarity,
+                                  '--no-rebase', '--rmdir'])
+      if 'Committed r' in output:
+        revision = re.match(
+          '.*?\nCommitted r(\\d+)', output, re.DOTALL).group(1)
+    logging.debug(output)
   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:
+  if not revision:
     print 'Failed to push. If this persists, please file a bug.'
-    return retcode
+    return 1
 
   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':
-        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
-
-    revision = revision[:7]
-
     to_pending = ' to pending queue' if pushed_to_pending else ''
     viewvc_url = settings.GetViewVCUrl()
     if not to_pending:
       if viewvc_url and revision:
         change_desc.append_footer(
             'Committed: %s%s' % (viewvc_url, revision))
       elif revision:
         change_desc.append_footer('Committed: %s' % (revision,))
     print ('Closing issue '
            '(you may be prompted for your codereview password)...')
     cl.UpdateDescription(change_desc.description)
     cl.CloseIssue()
     props = cl.GetIssueProperties()
     patch_num = len(props['patchsets'])
     comment = "Committed patchset #%d (id:%d)%s manually as %s" % (
-        patch_num, props['patchsets'][-1], to_pending, revision)
+        patch_num, props['patchsets'][-1], to_pending, revision[:7])
     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:
     _, branch = cl.FetchUpstreamTuple(cl.GetBranch())
     print 'The commit is in the pending queue (%s).' % pending_ref
@@ skipping 721 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:]))