Catch ValueErrors when trying to convert the CL issue number in git presubmit...

git_cl_hooks.py

 # Copyright (c) 2009 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.
 
 import os
 import re
 import subprocess
 import sys
 
 import breakpad
@@ skipping 24 matching lines @@
     if not root:
       raise Exception("Could not get root directory.")
     log = Backquote(['git', 'show', '--name-only',
                      '--pretty=format:%H%n%s%n%n%b'])
     m = re.match(r'^(\w+)\n(.*)$', log, re.MULTILINE|re.DOTALL)
     if not m:
       raise Exception("Could not parse log message: %s" % log)
     name = m.group(1)
     files = scm.GIT.CaptureStatus([root], upstream_branch)
     issue = Backquote(['git', 'cl', 'status', '--field=id'])
-    if issue == "None":
+    try:
+      description = gcl.GetIssueDescription(int(issue))

[chase, 2010/01/08 20:15:56]

I suspect this code is a no-op on my system.. md5sum shows there's more in the
stream than just printable ASCII characters:

cmp@cphillips4-corp:/work/chromium/src$ git cl status --field=id
528005
cmp@cphillips4-corp:/work/chromium/src$ git cl status --field=id|md5sum
30814fb92261dfe2a4f8455401f9026f *-
cmp@cphillips4-corp:/work/chromium/src$ echo 528005|md5sum
5dc84781c17e3b8188b3fc3cba92895c *-

I don't think a change to the hooks can fix this problem.  The original explicit
test for None was nice.  The real problem seems to be whether git-cl status is
prepending an escape sequence to its status output.  It might be an accident
that the output is unclean.  (A quick scan of git-cl reads like it shouldn't be
printing anything other than the issue number.)

Let's verify if this happens elsewhere.  Can you try the above command and lmk
what you see on your system?

[Robert Sesek, 2010/01/08 20:23:46]

I'm on a Mac, FYI:

[src (gtk-cookie-test)] rsesek% git cl status --field=id       
529003
[src (gtk-cookie-test)] rsesek% git cl status --field=id|md5
54550ce93575ef51d3b6030e5e6fe891
[src (gtk-cookie-test)] rsesek% echo "529003"|md5           
54550ce93575ef51d3b6030e5e6fe891

+    except ValueError:
       description = m.group(2)
-    else:
-      description = gcl.GetIssueDescription(int(issue))
     patchset = None
     self.change = presubmit_support.GitChange(name, description, absroot, files,
                                               issue, patchset)
 
 
 def RunHooks(hook_name, upstream_branch):
   commit = (hook_name == 'pre-cl-dcommit')
 
   # Create our options based on the command-line args and the current checkout.
   options = ChangeOptions(commit=commit, upstream_branch=upstream_branch)
@@ skipping 10 matching lines @@
   if presubmit_support.DoPresubmitChecks(options.change,
                                          options.commit,
                                          options.verbose,
                                          sys.stdout,
                                          sys.stdin,
                                          options.default_presubmit,
                                          options.may_prompt):
     sys.exit(0)
   else:
     sys.exit(1)