update git-cl for OWNERS file support via .git/hooks/pre-cl-*

git_cl_hooks.py

 # Copyright (c) 2010 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 subprocess
 import sys
 
 import breakpad  # pylint: disable=W0611
 
@@ skipping 14 matching lines @@
                           stdout=subprocess.PIPE).communicate()[0].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
 
 
-class ChangeOptions:
-  def __init__(self, commit=None, upstream_branch=None):
+class ChangeOptions(object):
+  def __init__(self, commit, upstream_branch, cmd_line_options):
     self.commit = commit
     self.verbose = None
     self.default_presubmit = None
     self.may_prompt = None
+    self.host_url = cmd_line_options.host_url
+    self.tbr = cmd_line_options.tbr
 
     root = Backquote(['git', 'rev-parse', '--show-cdup'])
     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 = Backquote(['git', 'rev-parse', 'HEAD'])
     files = scm.GIT.CaptureStatus([root], upstream_branch)
     cl = git_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 = Backquote(['git', 'log', '--pretty=format:%s%n%n%b',
                                '%s...' % (upstream_branch)])
     self.change = presubmit_support.GitChange(name, description, absroot, files,
                                               issue, patchset)
 
+# TODO(dpranke): remove when we make cmd_line_options mandatory in RunHooks().
+class DefaultOptions(object):
+  tbr = False
+  host_url = None
 
-def RunHooks(hook_name, upstream_branch):
+
+def RunHooks(hook_name, upstream_branch, cmd_line_options=None):
+  # TODO(dpranke): make cmd_line_options mandatory
+  cmd_line_options = cmd_line_options or DefaultOptions()
+
   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)
+  options = ChangeOptions(commit, upstream_branch, cmd_line_options)
 
   # Apply watchlists on upload.
   if not commit:
     watchlist = watchlists.Watchlists(options.change.RepositoryRoot())
     files = [f.LocalPath() for f in options.change.AffectedFiles()]
     watchers = watchlist.GetWatchersForPaths(files)
     Backquote(['git', 'config', '--replace-all',
                'rietveld.extracc', ','.join(watchers)])
 
   # Run the presubmit checks.
+  # TODO(dpranke): just pass the whole options object?
   if presubmit_support.DoPresubmitChecks(options.change,
                                          options.commit,
                                          options.verbose,
                                          sys.stdout,
                                          sys.stdin,
                                          options.default_presubmit,
-                                         options.may_prompt):
+                                         options.may_prompt,
+                                         options.tbr,
+                                         options.host_url):
     sys.exit(0)
   else:
     sys.exit(1)