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

presubmit_support.py

Index: presubmit_support.py
diff --git a/presubmit_support.py b/presubmit_support.py
index 0868a5d7bbd6f442d68204e5f7895f825bcad400..dec0f04fc4ceafe7261c87dfd5e31994991f36a8 100755
--- a/presubmit_support.py
+++ b/presubmit_support.py
@@ -154,19 +154,12 @@ class OutputApi(object):
       """Whether this presubmit result should result in a prompt warning."""
       return False
 
-    def IsMessage(self):
-      """Whether this result contains anything needing to be displayed."""
-      return True

[Dirk Pranke, 2011/03/11 04:33:47]

I had to remove the IsMessage() check, because it turns out that I need the
"ADD: " lines to be echoed into the output, of course. DoPresubmitHooks() has no
way of knowing whether suppressing it is the right thing to do. We'll just have
to live with some noise in the output for now, but I think (not positive) that
this is okay.

-
   class PresubmitAddText(PresubmitResult):
     """Propagates a line of text back to the caller."""
     def __init__(self, message, items=None, long_text=''):
       super(OutputApi.PresubmitAddText, self).__init__("ADD: " + message,
           items, long_text)
 
-    def IsMessage(self):
-      return False
-
   class PresubmitError(PresubmitResult):
     """A hard presubmit error."""
     def IsFatal(self):
@@ -227,23 +220,23 @@ class InputApi(object):
       r"(|.*[\\\/])\.svn[\\\/].*",
   )
 
-  # TODO(dpranke): Update callers to pass in is_tbr, host_url, remove
-  # default arguments.
-  def __init__(self, change, presubmit_path, is_committing, is_tbr=False,
-    host_url='http://codereview.chromium.org'):
+  def __init__(self, change, presubmit_path, is_committing, tbr, host_url=None):
     """Builds an InputApi object.
 
     Args:
       change: A presubmit.Change object.
       presubmit_path: The path to the presubmit script being processed.
       is_committing: True if the change is about to be committed.
+      tbr: True if '--tbr' was passed to skip any reviewer/owner checks
+      host_url: scheme, host, and path of rietveld instance
     """
     # Version number of the presubmit_support script.
     self.version = [int(x) for x in __version__.split('.')]
     self.change = change
     self.host_url = host_url
     self.is_committing = is_committing
-    self.is_tbr = is_tbr
+    self.tbr = tbr
+    self.host_url = host_url or 'http://codereview.chromium.org'
 
     # We expose various modules and functions as attributes of the input_api
     # so that presubmit scripts don't have to import them.
@@ -935,14 +928,19 @@ def DoGetTrySlaves(changed_files,
 
 
 class PresubmitExecuter(object):
-  def __init__(self, change, committing):
+  def __init__(self, change, committing, tbr, host_url):
     """
     Args:
       change: The Change object.
       committing: True if 'gcl commit' is running, False if 'gcl upload' is.
+      tbr: True if '--tbr' was passed to skip any reviewer/owner checks
+      host_url: scheme, host, and path of rietveld instance
+          (or None for default)
     """
     self.change = change
     self.committing = committing
+    self.tbr = tbr
+    self.host_url = host_url
 
   def ExecPresubmitScript(self, script_text, presubmit_path):
     """Executes a single presubmit script.
@@ -961,7 +959,8 @@ class PresubmitExecuter(object):
     os.chdir(os.path.dirname(presubmit_path))
 
     # Load the presubmit script into context.
-    input_api = InputApi(self.change, presubmit_path, self.committing)
+    input_api = InputApi(self.change, presubmit_path, self.committing,
+                         self.tbr, self.host_url)
     context = {}
     exec script_text in context
 
@@ -992,14 +991,16 @@ class PresubmitExecuter(object):
     os.chdir(main_path)
     return result
 
-
+# TODO(dpranke): make all callers pass in tbr, host_url?
 def DoPresubmitChecks(change,
                       committing,
                       verbose,
                       output_stream,
                       input_stream,
                       default_presubmit,
-                      may_prompt):
+                      may_prompt,
+                      tbr=False,
+                      host_url=None):
   """Runs all presubmit checks that apply to the files in the change.
 
   This finds all PRESUBMIT.py files in directories enclosing the files in the
@@ -1017,6 +1018,9 @@ def DoPresubmitChecks(change,
     input_stream: A stream to read input from the user.
     default_presubmit: A default presubmit script to execute in any case.
     may_prompt: Enable (y/n) questions on warning or error.
+    tbr: was --tbr specified to skip any reviewer/owner checks?
+    host_url: scheme, host, and port of host to use for rietveld-related
+        checks
 
   Warning:
     If may_prompt is true, output_stream SHOULD be sys.stdout and input_stream
@@ -1032,7 +1036,7 @@ def DoPresubmitChecks(change,
   if not presubmit_files and verbose:
     output_stream.write("Warning, no presubmit.py found.\n")
   results = []
-  executer = PresubmitExecuter(change, committing)
+  executer = PresubmitExecuter(change, committing, tbr, host_url)
   if default_presubmit:
     if verbose:
       output_stream.write("Running default presubmit script.\n")
@@ -1064,9 +1068,6 @@ def DoPresubmitChecks(change,
     if items:
       output_stream.write('** Presubmit %s **\n' % name)
       for item in items:
-        if not item.IsMessage():

[Dirk Pranke, 2011/03/11 04:33:47]

See comment above.

-          continue
-
         # Access to a protected member XXX of a client class
         # pylint: disable=W0212
         if not item._Handle(output_stream, input_stream,