Add skip_canned option to presubmit_support.

presubmit_support.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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'
 
 # TODO(joi) Add caching where appropriate/needed. The API is designed to allow
 # caching (between all different invocations of presubmit scripts for a given
 # change). We should add it as our presubmit scripts start feeling slow.
 
 import cPickle  # Exposed through the API.
 import cStringIO  # Exposed through the API.
+import contextlib
 import fnmatch
 import glob
 import inspect
 import json  # Exposed through the API.
 import logging
 import marshal  # Exposed through the API.
 import optparse
 import os  # Somewhat exposed through the API.
 import pickle  # Exposed through the API.
 import random
@@ skipping 1164 matching lines @@
     if not files:
       files = scm.GIT.CaptureStatus([], options.root, None)
   else:
     logging.info('Doesn\'t seem under source control. Got %d files' % len(args))
     if not files:
       return None, None
     change_class = Change
   return change_class, files
 
 
+class NonexistantCannedCheckFilter(Exception):
+  pass
+

[M-A Ruel, 2013/03/08 02:09:02]

2 lines

+@contextlib.contextmanager
+def canned_check_filter(method_names):
+  filtered = {}
+  try:
+    for method_name in method_names:
+      if hasattr(presubmit_canned_checks, method_name):

[M-A Ruel, 2013/03/08 02:09:02]

if not hasattr():
  raise
then align -2 lines 1211-1212

+        filtered[method_name] = getattr(presubmit_canned_checks, method_name)
+        setattr(presubmit_canned_checks, method_name, lambda *_a, **_kw: [])
+      else:
+        raise NonexistantCannedCheckFilter(method_name)
+    yield
+  finally:
+    for name, method in filtered.iteritems():
+      setattr(presubmit_canned_checks, name, method)
+
+
 def Main(argv):
   parser = optparse.OptionParser(usage="%prog [options] <files...>",
                                  version="%prog " + str(__version__))
   parser.add_option("-c", "--commit", action="store_true", default=False,
                    help="Use commit instead of upload checks")
   parser.add_option("-u", "--upload", action="store_false", dest='commit',
                    help="Use upload instead of commit checks")
   parser.add_option("-r", "--recursive", action="store_true",
                    help="Act recursively")
   parser.add_option("-v", "--verbose", action="count", default=0,
                    help="Use 2 times for more debug info")
   parser.add_option("--name", default='no name')
   parser.add_option("--author")
   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("--skip_canned", action='append', default=[],
+                    help="A list of checks to skip which appear in "
+                    "presubmit_canned_checks. Can be provided multiple times "
+                    "to skip multiple canned checks.")
   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.CachingRietveld(
         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,
-        rietveld_obj)
+    with canned_check_filter(options.skip_canned):
+      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,
+          rietveld_obj)
     return not results.should_continue()
+  except NonexistantCannedCheckFilter, e:
+    print >> sys.stderr, (
+      'Attempted to skip nonexistent canned presubmit check: %s' % e.message)
+    return 2
   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))