Support additional user presubmit scripts named PRESUBMIT*.py.

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.8.0'
 
@@ skipping 476 matching lines @@
 
     The lists will be compiled as regular expression and
     AffectedFile.LocalPath() needs to pass both list.
 
     Note: Copy-paste this function to suit your needs or use a lambda function.
     """
     def Find(affected_file, items):
       local_path = affected_file.LocalPath()
       for item in items:
         if self.re.match(item, local_path):
-          logging.debug("%s matched %s" % (item, local_path))
+          logging.debug("%s matched %s", item, local_path)
           return True
       return False
     return (Find(affected_file, white_list or self.DEFAULT_WHITE_LIST) and
             not Find(affected_file, black_list or self.DEFAULT_BLACK_LIST))
 
   def AffectedSourceFiles(self, source_file):
     """Filter the list of AffectedTextFiles by the function source_file.
 
     If source_file is None, InputApi.FilterSourceFile() is used.
     """
@@ skipping 131 matching lines @@
   # pylint: disable=R0201
   def __init__(self, path, action, repository_root, diff_cache):
     self._path = path
     self._action = action
     self._local_root = repository_root
     self._is_directory = None
     self._properties = {}
     self._cached_changed_contents = None
     self._cached_new_contents = None
     self._diff_cache = diff_cache
-    logging.debug('%s(%s)' % (self.__class__.__name__, self._path))
+    logging.debug('%s(%s)', self.__class__.__name__, self._path)
 
   def ServerPath(self):
     """Returns a path string that identifies the file in the SCM system.
 
     Returns the empty string if the file does not exist in SCM.
     """
     return ''
 
   def LocalPath(self):
     """Returns the path of this file on the local disk relative to client root.
@@ skipping 426 matching lines @@
         break
       parent_dir = os.path.dirname(directory)
       if parent_dir == directory:
         # We hit the system root directory.
         break
       directory = parent_dir
 
   # Look for PRESUBMIT.py in all candidate directories.
   results = []
   for directory in sorted(list(candidates)):
-    p = os.path.join(directory, 'PRESUBMIT.py')
-    if os.path.isfile(p):
-      results.append(p)
+    for f in os.listdir(directory):
+      p = os.path.join(directory, f)
+      if os.path.isfile(p) and re.match(
+          r'PRESUBMIT.*\.py$', f) and not f.startswith('PRESUBMIT_test'):
+        results.append(p)
 
-  logging.debug('Presubmit files: %s' % ','.join(results))
+  logging.debug('Presubmit files: %s', ','.join(results))
   return results
 
 
 class GetTrySlavesExecuter(object):
   @staticmethod
   def ExecPresubmitScript(script_text, presubmit_path, project, change):
     """Executes GetPreferredTrySlaves() from a single presubmit script.
 
     This will soon be deprecated and replaced by GetPreferredTryMasters().
 
@@ skipping 336 matching lines @@
       raise PresubmitFailure('"%s" had an exception.\n%s' % (presubmit_path, e))
 
     # These function names must change if we make substantial changes to
     # the presubmit API that are not backwards compatible.
     if self.committing:
       function_name = 'CheckChangeOnCommit'
     else:
       function_name = 'CheckChangeOnUpload'
     if function_name in context:
       context['__args'] = (input_api, OutputApi(self.committing))
-      logging.debug('Running %s in %s' % (function_name, presubmit_path))
+      logging.debug('Running %s in %s', function_name, presubmit_path)
       result = eval(function_name + '(*__args)', context)
-      logging.debug('Running %s done.' % function_name)
+      logging.debug('Running %s done.', function_name)
       if not (isinstance(result, types.TupleType) or
               isinstance(result, types.ListType)):
         raise PresubmitFailure(
           'Presubmit functions must return a tuple or list')
       for item in result:
         if not isinstance(item, OutputApi.PresubmitResult):
           raise PresubmitFailure(
             'All presubmit results must be of types derived from '
             'output_api.PresubmitResult')
     else:
@@ skipping 132 matching lines @@
         dirs.remove('.svn')
       if '.git' in dirs:
         dirs.remove('.git')
       for name in files:
         if fnmatch.fnmatch(name, mask):
           results.append(os.path.join(root, name))
     return results
 
 
 def ParseFiles(args, recursive):
-  logging.debug('Searching for %s' % args)
+  logging.debug('Searching for %s', args)
   files = []
   for arg in args:
     files.extend([('M', f) for f in ScanSubDirs(arg, recursive)])
   return files
 
 
 def load_files(options, args):
   """Tries to determine the SCM."""
   change_scm = scm.determine_scm(options.root)
   files = []
   if args:
     files = ParseFiles(args, options.recursive)
   if change_scm == 'svn':
     change_class = SvnChange
     if not files:
       files = scm.SVN.CaptureStatus([], options.root)
   elif change_scm == 'git':
     change_class = GitChange
     upstream = options.upstream or None
     if not files:
       files = scm.GIT.CaptureStatus([], options.root, upstream)
   else:
-    logging.info('Doesn\'t seem under source control. Got %d files' % len(args))
+    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
 
 
@@ skipping 101 matching lines @@
   if options.rietveld_email and options.rietveld_email_file:
     parser.error("Only one of --rietveld_email or --rietveld_email_file "
                  "can be passed to this program.")
   if options.rietveld_email_file:
     with open(options.rietveld_email_file, "rb") as f:
       options.rietveld_email = f.read().strip()
 
   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))
+  logging.info('Found %d file(s).', len(files))
 
   rietveld_obj, gerrit_obj = None, None
 
   if options.rietveld_url:
     # The empty password is permitted: '' is not None.
     if options.rietveld_private_key_file:
       rietveld_obj = rietveld.JwtOAuth2Rietveld(
         options.rietveld_url,
         options.rietveld_email,
         options.rietveld_private_key_file)
@@ skipping 52 matching lines @@
     return 2
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   try:
     sys.exit(main())
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(2)