Add --rietveld_XXX arguments to presubmit_support to the commit queue can use it.

presubmit_support.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.
 
 """Enables directory-specific presubmit checks to run at upload and/or commit.
 """
 
 __version__ = '1.6.1'
 
@@ skipping 29 matching lines @@
   except ImportError:
     # Import the one included in depot_tools.
     sys.path.append(os.path.join(os.path.dirname(__file__), 'third_party'))
     import simplejson as json  # pylint: disable=F0401
 
 # Local imports.
 import fix_encoding
 import gclient_utils
 import owners
 import presubmit_canned_checks
+import rietveld
 import scm
 import subprocess2 as subprocess  # Exposed through the API.
 
 
 # Ask for feedback only once in program lifetime.
 _ASKED_FOR_FEEDBACK = False
 
 
 class PresubmitFailure(Exception):
   pass
@@ skipping 149 matching lines @@
       r".*\bxcodebuild[\\\/].*",
       r".*\bsconsbuild[\\\/].*",
       # All caps files like README and LICENCE.
       r".*\b[A-Z0-9_]{2,}$",
       # SCM (can happen in dual SCM configuration). (Slightly over aggressive)
       r"(|.*[\\\/])\.git[\\\/].*",
       r"(|.*[\\\/])\.svn[\\\/].*",
   )
 
   def __init__(self, change, presubmit_path, is_committing, tbr,
-      rietveld, verbose):
+      rietveld_obj, verbose):
     """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
-      rietveld: rietveld client object
+      rietveld_obj: rietveld.Rietveld client object
     """
     # Version number of the presubmit_support script.
     self.version = [int(x) for x in __version__.split('.')]
     self.change = change
     self.is_committing = is_committing
     self.tbr = tbr
-    self.rietveld = rietveld
+    self.rietveld = rietveld_obj
     # TBD
     self.host_url = 'http://codereview.chromium.org'
     if self.rietveld:
-      self.host_url = rietveld.url
+      self.host_url = self.rietveld.url
 
     # We expose various modules and functions as attributes of the input_api
     # so that presubmit scripts don't have to import them.
     self.basename = os.path.basename
     self.cPickle = cPickle
     self.cStringIO = cStringIO
     self.json = json
     self.logging = logging.getLogger('PRESUBMIT')
     self.os_listdir = os.listdir
     self.os_walk = os.walk
@@ skipping 699 matching lines @@
         presubmit_script, filename, project)
 
   slaves = list(set(results))
   if slaves and verbose:
     output_stream.write(', '.join(slaves))
     output_stream.write('\n')
   return slaves
 
 
 class PresubmitExecuter(object):
-  def __init__(self, change, committing, tbr, rietveld, verbose):
+  def __init__(self, change, committing, tbr, rietveld_obj, verbose):
     """
     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
-      rietveld: rietveld client object.
+      rietveld_obj: rietveld.Rietveld client object.
     """
     self.change = change
     self.committing = committing
     self.tbr = tbr
-    self.rietveld = rietveld
+    self.rietveld = rietveld_obj
     self.verbose = verbose
 
   def ExecPresubmitScript(self, script_text, presubmit_path):
     """Executes a single presubmit script.
 
     Args:
       script_text: The text of the presubmit script.
       presubmit_path: The path to the presubmit file (this will be reported via
         input_api.PresubmitLocalPath()).
 
@@ skipping 43 matching lines @@
 
 
 def DoPresubmitChecks(change,
                       committing,
                       verbose,
                       output_stream,
                       input_stream,
                       default_presubmit,
                       may_prompt,
                       tbr,
-                      rietveld):
+                      rietveld_obj):
   """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
   change (up to the repository root) and calls the relevant entrypoint function
   depending on whether the change is being committed or uploaded.
 
   Prints errors, warnings and notifications.  Prompts the user for warnings
   when needed.
 
   Args:
     change: The Change object.
     committing: True if 'gcl commit' is running, False if 'gcl upload' is.
     verbose: Prints debug info.
     output_stream: A stream to write output from presubmit tests to.
     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?
-    rietveld: rietveld object.
+    rietveld_obj: rietveld.Rietveld object.
 
   Warning:
     If may_prompt is true, output_stream SHOULD be sys.stdout and input_stream
     SHOULD be sys.stdin.
 
   Return:
     A PresubmitOutput object. Use output.should_continue() to figure out
     if there were errors or warnings and the caller should abort.
   """
   old_environ = os.environ
   try:
     # Make sure python subprocesses won't generate .pyc files.
     os.environ = os.environ.copy()
     os.environ['PYTHONDONTWRITEBYTECODE'] = '1'
 
     output = PresubmitOutput(input_stream, output_stream)
     if committing:
       output.write("Running presubmit commit checks ...\n")
     else:
       output.write("Running presubmit upload checks ...\n")
     start_time = time.time()
     presubmit_files = ListRelevantPresubmitFiles(
         change.AbsoluteLocalPaths(True), change.RepositoryRoot())
     if not presubmit_files and verbose:
       output.write("Warning, no presubmit.py found.\n")
     results = []
-    executer = PresubmitExecuter(change, committing, tbr, rietveld, verbose)
+    executer = PresubmitExecuter(change, committing, tbr, rietveld_obj, verbose)
     if default_presubmit:
       if verbose:
         output.write("Running default presubmit script.\n")
       fake_path = os.path.join(change.RepositoryRoot(), 'PRESUBMIT.py')
       results += executer.ExecPresubmitScript(default_presubmit, fake_path)
     for filename in presubmit_files:
       filename = os.path.abspath(filename)
       if verbose:
         output.write("Running %s\n" % filename)
       # Accept CRLF presubmit script.
@@ skipping 108 matching lines @@
   parser.add_option("--description", default='')
   parser.add_option("--issue", type='int', default=0)
   parser.add_option("--patchset", type='int', default=0)
   parser.add_option("--root", default=os.getcwd(),
                     help="Search for PRESUBMIT.py up to this directory. "
                     "If inherit-review-settings-ok is present in this "
                     "directory, parent directories up to the root file "
                     "system directories will also be searched.")
   parser.add_option("--default_presubmit")
   parser.add_option("--may_prompt", action='store_true', default=False)
+  parser.add_option("--rietveld_url", help=optparse.SUPPRESS_HELP)
+  parser.add_option("--rietveld_email", help=optparse.SUPPRESS_HELP)
+  parser.add_option("--rietveld_password", help=optparse.SUPPRESS_HELP)
   options, args = parser.parse_args(argv)
   if options.verbose >= 2:
     logging.basicConfig(level=logging.DEBUG)
   elif options.verbose:
     logging.basicConfig(level=logging.INFO)
   else:
     logging.basicConfig(level=logging.ERROR)
   change_class, files = load_files(options, args)
   if not change_class:
     parser.error('For unversioned directory, <files> is not optional.')
   logging.info('Found %d file(s).' % len(files))
+  rietveld_obj = None
+  if options.rietveld_url:
+    rietveld_obj = rietveld.Rietveld(
+        options.rietveld_url,
+        options.rietveld_email,
+        options.rietveld_password)
   try:
     results = DoPresubmitChecks(
         change_class(options.name,
                     options.description,
                     options.root,
                     files,
                     options.issue,
                     options.patchset,
                     options.author),
         options.commit,
         options.verbose,
         sys.stdout,
         sys.stdin,
         options.default_presubmit,
         options.may_prompt,
         False,
-        None)
+        rietveld_obj)
     return not results.should_continue()
   except PresubmitFailure, e:
     print >> sys.stderr, e
     print >> sys.stderr, 'Maybe your depot_tools is out of date?'
     print >> sys.stderr, 'If all fails, contact maruel@'
     return 2
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   sys.exit(Main(None))