Improve parsing of committed hash to be more resilient.

git_cl/git_cl.py

 #!/usr/bin/python
 # git-cl -- a git-command for integrating reviews on Rietveld
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 import errno
 import logging
 import optparse
 import os
 import re
 import subprocess
@@ skipping 978 matching lines @@
       output = RunGit(['svn', 'dcommit', '--no-rebase'])
   finally:
     # And then swap back to the original branch and clean up.
     RunGit(['checkout', '-q', cl.GetBranch()])
     RunGit(['branch', '-D', MERGE_BRANCH])
 
   if cl.GetIssue():
     if cmd == 'dcommit' and 'Committed r' in output:
       revision = re.match('.*?\nCommitted r(\\d+)', output, re.DOTALL).group(1)
     elif cmd == 'push' and retcode == 0:
-      revision = output.splitlines()[1].split('\t')[2].split('..')[1]
+      m = (re.match(r'.*?([a-f0-9]{7})\.\.([a-f0-9]{7})$', l)

[evanm, 2011/01/12 00:21:06]

Can you use longer variable names?  ("match" instead of "m", the "l" is fine)

+           for l in output.splitlines(False))
+      m = filter(None, m)
+      if not len(m) == 1:

[evanm, 2011/01/12 00:21:06]

Didn't realize this was valid Python (rather than len(m) != 1)

+        DieWithError("Couldn't parse ouput to extract the committed hash:\n%s" %
+            output)
+      revision = m[0].group(2)
     else:
       return 1
     viewvc_url = settings.GetViewVCUrl()
     if viewvc_url and revision:
       cl.description += ('\n\nCommitted: ' + viewvc_url + revision)
     print ('Closing issue '
            '(you may be prompted for your codereview password)...')
     cl.CloseIssue()
     cl.SetIssue(0)
   return 0
@@ skipping 235 matching lines @@
             ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
              'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
   # Not a known command. Default to help.
   GenUsage(parser, 'help')
   return CMDhelp(parser, argv)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))