refactor presubmit parsing code from git-cl into presubmit

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 464 matching lines @@
 
   SetProperty(settings.GetCCList(), 'CC list', 'cc')
   SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
               'tree-status-url')
   SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url')
 
   # TODO: configure a default branch to diff against, rather than this
   # svn-based hackery.
 
 
-class HookResults(object):
-  """Contains the parsed output of the presubmit hooks."""
-  def __init__(self, output_from_hooks=None):
-    self.reviewers = []
-    self.output = None
-    self._ParseOutputFromHooks(output_from_hooks)
-
-  def _ParseOutputFromHooks(self, output_from_hooks):
-    if not output_from_hooks:
-      return
-    lines = []
-    reviewers = []
-    reviewer_regexp = re.compile('ADD: R=(.+)')
-    for l in output_from_hooks.splitlines():
-      m = reviewer_regexp.match(l)
-      if m:
-        reviewers.extend(m.group(1).split(','))
-      else:
-        lines.append(l)
-    self.output = '\n'.join(lines)
-    self.reviewers = ','.join(reviewers)
-
-
 class ChangeDescription(object):
   """Contains a parsed form of the change description."""
   def __init__(self, subject, log_desc, reviewers):
     self.subject = subject
     self.log_desc = log_desc
     self.reviewers = reviewers
     self.description = self.log_desc
 
   def Update(self):
     initial_text = """# Enter a description of the change.
@@ skipping 247 matching lines @@
                                        issue, patchset)
 
   # Apply watchlists on upload.
   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()
-  should_continue = presubmit_support.DoPresubmitChecks(change, committing,
-      verbose=None, output_stream=output, input_stream=sys.stdin,
-      default_presubmit=None, may_prompt=False, tbr=tbr,
+  output = presubmit_support.DoPresubmitChecks(change, committing,
+      verbose=False, output_stream=sys.stdout, input_stream=sys.stdin,
+      default_presubmit=None, may_prompt=may_prompt, 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 should_continue and hook_results.output and (
-      '** Presubmit ERRORS **\n' in hook_results.output or
-      '** Presubmit WARNINGS **\n' in hook_results.output):
-    should_continue = False
+  if not output.should_continue():
+    sys.exit(1)
 
-  if not should_continue:
-    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)
-
-
-  return hook_results
+  return output
 
 
 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.
   RunGit(['update-index', '--refresh', '-q'], error_ok=True)
@@ skipping 53 matching lines @@
     return 1
 
   cl = Changelist()
   if args:
     base_branch = args[0]
   else:
     # Default to diffing against the "upstream" branch.
     base_branch = cl.GetUpstreamBranch()
     args = [base_branch + "..."]
 
-  if not options.bypass_hooks:
+  if not options.bypass_hooks and not options.force:
     hook_results = RunHook(committing=False, upstream_branch=base_branch,
                            rietveld_server=cl.GetRietveldServer(), tbr=False,
-                           may_prompt=(not options.force))
-  else:
-    hook_results = HookResults()
+                           may_prompt=True)
+    if not options.reviewers and hook_results.reviewers:
+      options.reviewers = hook_results.reviewers
 
-  if not options.reviewers and hook_results.reviewers:
-    options.reviewers = hook_results.reviewers
 
   # --no-ext-diff is broken in some versions of Git, so try to work around
   # this by overriding the environment (but there is still a problem if the
   # git config key "diff.external" is used).
   env = os.environ.copy()
   if 'GIT_EXTERNAL_DIFF' in env:
     del env['GIT_EXTERNAL_DIFF']
   subprocess.call(['git', 'diff', '--no-ext-diff', '--stat', '-M'] + args,
                   env=env)
 
@@ skipping 124 matching lines @@
     svn_head = RunGit(['log', '--grep=^git-svn-id:', '-1',
                        '--pretty=format:%H'])
     extra_commits = RunGit(['rev-list', '^' + svn_head, base_branch])
     if extra_commits:
       print ('This branch has %d additional commits not upstreamed yet.'
              % len(extra_commits.splitlines()))
       print ('Upstream "%s" or rebase this branch on top of the upstream trunk '
              'before attempting to %s.' % (base_branch, cmd))
       return 1
 
-  if not options.bypass_hooks:
+  if not options.bypass_hooks and not options.force:
     RunHook(committing=True, upstream_branch=base_branch,
             rietveld_server=cl.GetRietveldServer(), tbr=options.tbr,
-            may_prompt=(not options.force))
+            may_prompt=True)
 
-  if not options.force and not options.bypass_hooks:
     if cmd == 'dcommit':
       # Check the tree status if the tree status URL is set.
       status = GetTreeStatus()
       if 'closed' == status:
         print ('The tree is closed.  Please wait for it to reopen. Use '
                '"git cl dcommit -f" to commit on a closed tree.')
         return 1
       elif 'unknown' == status:
         print ('Unable to determine tree status.  Please verify manually and '
                'use "git cl dcommit -f" to commit on a closed tree.')
@@ skipping 366 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:]))