Make RunHooks a method on ChangeList.

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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."""
 
 import errno
@@ skipping 493 matching lines @@
     """Set this branch's issue.  If issue=0, clears the issue."""
     if issue:
       RunGit(['config', self._IssueSetting(), str(issue)])
       if self.rietveld_server:
         RunGit(['config', self._RietveldServer(), self.rietveld_server])
     else:
       RunGit(['config', '--unset', self._IssueSetting()])
       self.SetPatchset(0)
     self.has_issue = False
 
+  def RunHook(self, committing, upstream_branch, tbr, may_prompt, verbose):
+    """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
+    root = RunCommand(['git', 'rev-parse', '--show-cdup']).strip()
+    if not root:

[M-A Ruel, 2011/04/18 14:43:11]

While at it;
  root = os.path.abspath(root or '.')

and remove lines 519-521 since line 520 can never trigger atm.

+      root = '.'
+    absroot = os.path.abspath(root)
+    if not root:
+      raise Exception('Could not get root directory.')
+
+    # We use the sha1 of HEAD as a name of this change.
+    name = RunCommand(['git', 'rev-parse', 'HEAD']).strip()
+    files = scm.GIT.CaptureStatus([root], upstream_branch)
+
+    issue = ConvertToInteger(self.GetIssue())
+    patchset = ConvertToInteger(self.GetPatchset())
+    if issue:
+      description = self.GetDescription()
+    else:
+      # If the change was never uploaded, use the log messages of all commits
+      # up to the branch point, as git cl upload will prefill the description
+      # with these log messages.
+      description = RunCommand(['git', 'log', '--pretty=format:%s%n%n%b',
+                                '%s...' % (upstream_branch)]).strip()
+    change = presubmit_support.GitChange(
+        name,
+        description,
+        absroot,
+        files,
+        issue,
+        patchset,
+        None)
+
+    # Apply watchlists on upload.
+    if not committing:
+      watchlist = watchlists.Watchlists(change.RepositoryRoot())
+      files = [f.LocalPath() for f in change.AffectedFiles()]
+      self.SetWatchers(watchlist.GetWatchersForPaths(files))
+
+    try:
+      output = presubmit_support.DoPresubmitChecks(change, committing,
+          verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
+          default_presubmit=None, may_prompt=may_prompt, tbr=tbr,
+          rietveld=self.RpcServer())
+    except presubmit_support.PresubmitFailure, e:
+      DieWithError(
+          ('%s\nMaybe your depot_tools is out of date?\n'
+           'If all fails, contact maruel@') % e)
+
+    # TODO(dpranke): We should propagate the error out instead of calling
+    # exit().
+    if not output.should_continue():
+      sys.exit(1)
+
+    return output
+
   def CloseIssue(self):
     rpc_server = self.RpcServer()
     # Newer versions of Rietveld require us to pass an XSRF token to POST, so
     # we fetch it from the server.  (The version used by Chromium has been
     # modified so the token isn't required when closing an issue.)
     xsrf_token = rpc_server.Send('/xsrf_token',
                                  extra_headers={'X-Requesting-XSRF-Token': '1'})
 
     # You cannot close an issue with a GET.
     # We pass an empty string for the data so it is a POST rather than a GET.
@@ skipping 281 matching lines @@
 
 
 def ConvertToInteger(inputval):
   """Convert a string to integer, but returns either an int or None."""
   try:
     return int(inputval)
   except (TypeError, ValueError):
     return None
 
 
-def RunHook(committing, upstream_branch, rietveld_server, tbr, may_prompt,
-    verbose):
-  """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
-  root = RunCommand(['git', 'rev-parse', '--show-cdup']).strip()
-  if not root:
-    root = '.'
-  absroot = os.path.abspath(root)
-  if not root:
-    raise Exception('Could not get root directory.')
-
-  # We use the sha1 of HEAD as a name of this change.
-  name = RunCommand(['git', 'rev-parse', 'HEAD']).strip()
-  files = scm.GIT.CaptureStatus([root], upstream_branch)
-
-  cl = Changelist()
-  issue = ConvertToInteger(cl.GetIssue())
-  patchset = ConvertToInteger(cl.GetPatchset())
-  if issue:
-    description = cl.GetDescription()
-  else:
-    # If the change was never uploaded, use the log messages of all commits
-    # up to the branch point, as git cl upload will prefill the description
-    # with these log messages.
-    description = RunCommand(['git', 'log', '--pretty=format:%s%n%n%b',
-                              '%s...' % (upstream_branch)]).strip()
-  change = presubmit_support.GitChange(
-      name,
-      description,
-      absroot,
-      files,
-      issue,
-      patchset,
-      None)
-
-  # Apply watchlists on upload.
-  if not committing:
-    watchlist = watchlists.Watchlists(change.RepositoryRoot())
-    files = [f.LocalPath() for f in change.AffectedFiles()]
-    cl.SetWatchers(watchlist.GetWatchersForPaths(files))
-
-  try:
-    output = presubmit_support.DoPresubmitChecks(change, committing,
-        verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
-        default_presubmit=None, may_prompt=may_prompt, tbr=tbr,
-        rietveld=cl.RpcServer())
-  except presubmit_support.PresubmitFailure, e:
-    DieWithError(
-        ('%s\nMaybe your depot_tools is out of date?\n'
-         'If all fails, contact maruel@') % e)
-
-  # TODO(dpranke): We should propagate the error out instead of calling exit().
-  if not output.should_continue():
-    sys.exit(1)
-
-  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)
   if RunGit(['diff-index', 'HEAD']):
     # TODO(maruel): Is this really necessary?
     print 'Cannot presubmit with a dirty tree.  You must commit locally first.'
     return 1
 
   cl = Changelist()
   if args:
     base_branch = args[0]
   else:
     # Default to diffing against the "upstream" branch.
     base_branch = cl.GetUpstreamBranch()
 
-  RunHook(committing=not options.upload, upstream_branch=base_branch,
-          rietveld_server=cl.GetRietveldServer(), tbr=False,
-          may_prompt=False, verbose=options.verbose)
+  cl.RunHook(committing=not options.upload, upstream_branch=base_branch,
+             tbr=False, may_prompt=False, verbose=options.verbose)
   return 0
 
 
 @usage('[args to "git diff"]')
 def CMDupload(parser, args):
   """upload the current changelist to codereview"""
   parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
                     help='bypass upload presubmit hook')
   parser.add_option('-f', action='store_true', dest='force',
                     help="force yes to questions (don't prompt)")
@@ skipping 21 matching lines @@
 
   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 and not options.force:
-    hook_results = RunHook(committing=False, upstream_branch=base_branch,
-                           rietveld_server=cl.GetRietveldServer(), tbr=False,
-                           may_prompt=True, verbose=options.verbose)
+    hook_results = cl.RunHook(committing=False, upstream_branch=base_branch,
+                              tbr=False, may_prompt=True,
+                              verbose=options.verbose)
     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']
@@ skipping 130 matching lines @@
                        '--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 and not options.force:
-    RunHook(committing=True, upstream_branch=base_branch,
-            rietveld_server=cl.GetRietveldServer(), tbr=options.tbr,
-            may_prompt=True, verbose=options.verbose)
+    cl.RunHook(committing=True, upstream_branch=base_branch,
+               tbr=options.tbr, may_prompt=True, verbose=options.verbose)
 
     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 '
@@ skipping 349 matching lines @@
              '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__':
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))