fix prompting if there were errors in the hooks

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 StringIO
@@ skipping 702 matching lines @@
   try:
     subprocess.check_call(['env', editor, filename])
     fileobj = open(filename)
     result = fileobj.read()
     fileobj.close()
   finally:
     os.remove(filename)
 
   if not result:
     return
-  
+
   stripcomment_re = re.compile(r'^#.*$', re.MULTILINE)
   return stripcomment_re.sub('', result).strip()
 
 
 def ConvertToInteger(inputval):
   """Convert a string to integer, but returns either an int or None."""
   try:
     return int(inputval)
   except (TypeError, ValueError):
     return None
@@ skipping 34 matching lines @@
   if not committing:
     watchlist = watchlists.Watchlists(change.RepositoryRoot())
     files = [f.LocalPath() for f in change.AffectedFiles()]
     watchers = watchlist.GetWatchersForPaths(files)
     RunCommand(['git', 'config', '--replace-all',
                'rietveld.extracc', ','.join(watchers)])
 
   output = StringIO.StringIO()
   res = presubmit_support.DoPresubmitChecks(change, committing,
       verbose=None, output_stream=output, input_stream=sys.stdin,
-      default_presubmit=None, may_prompt=may_prompt, tbr=tbr,
+      default_presubmit=None, may_prompt=False, tbr=tbr,
       host_url=cl.GetRietveldServer())
   hook_results = HookResults(output.getvalue())
   if hook_results.output:
     print hook_results.output
 
   # TODO(dpranke): We should propagate the error out instead of calling exit().
-  if not res:
-    sys.exit(1)
+  if not res and ('** Presubmit ERRORS **' in hook_results.output or

[M-A Ruel, 2011/03/12 15:37:31]

with '\n' ?

[Dirk Pranke, 2011/03/12 22:47:47]

I don't understand this comment? 

[M-A Ruel, 2011/03/13 00:53:00]

I meant to use '** Presubmit ERRORS **\n' so that it's a tad stricter.

+                  '** Presubmit WARNINGS **' in hook_results.output):
+    res = True
+
+  if res:
+    if may_prompt:
+      response = raw_input('Are you sure you want to continue? (y/N): ')
+      if not response.lower().startswith('y'):
+        sys.exit(1)
+    else:
+      sys.exit(1)
+

[M-A Ruel, 2011/03/12 15:37:31]

remove one extra line.

+
   return hook_results
 
 
 def CMDpresubmit(parser, args):
   """run presubmit tests on the current changelist"""
   parser.add_option('--upload', action='store_true',
                     help='Run upload hook instead of the push/dcommit hook')
   (options, args) = parser.parse_args(args)
 
   # Make sure index is up-to-date before running diff-index.
@@ skipping 599 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:]))