Fix ListRelevantPresubmitFiles().

presubmit_support.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 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.1'
 
@@ skipping 212 matching lines @@
       return depot_path
 
   def AffectedFiles(self, include_dirs=False, include_deletes=True):
     """Same as input_api.change.AffectedFiles() except only lists files
     (and optionally directories) in the same directory as the current presubmit
     script, or subdirectories thereof.
     """
     dir_with_slash = normpath("%s/" % self.PresubmitLocalPath())
     if len(dir_with_slash) == 1:
       dir_with_slash = ''
-    return filter(lambda x: normpath(x.LocalPath()).startswith(dir_with_slash),
-                  self.change.AffectedFiles(include_dirs, include_deletes))
+    return filter(
+        lambda x: normpath(x.AbsoluteLocalPath()).startswith(dir_with_slash),
+        self.change.AffectedFiles(include_dirs, include_deletes))
 
   def LocalPaths(self, include_dirs=False):
     """Returns local paths of input_api.AffectedFiles()."""
     return [af.LocalPath() for af in self.AffectedFiles(include_dirs)]
 
   def AbsoluteLocalPaths(self, include_dirs=False):
     """Returns absolute local paths of input_api.AffectedFiles()."""
     return [af.AbsoluteLocalPath() for af in self.AffectedFiles(include_dirs)]
 
   def ServerPaths(self, include_dirs=False):
@@ skipping 296 matching lines @@
       a 3 tuple:
         the AffectedFile instance of the current file;
         integer line number (1-based); and
         the contents of the line as a string.
     """
     return InputApi._RightHandSideLinesImpl(
         filter(lambda x: x.IsTextFile(),
                self.AffectedFiles(include_deletes=False)))
 
 
-def ListRelevantPresubmitFiles(files):
+def ListRelevantPresubmitFiles(files, root):
   """Finds all presubmit files that apply to a given set of source files.
 
   Args:
     files: An iterable container containing file paths.
+    root: Path where to stop searching.
 
   Return:
-    ['foo/blat/PRESUBMIT.py', 'mat/gat/PRESUBMIT.py']
+    List of absolute paths of the existing PRESUBMIT.py scripts.
   """
-  checked_dirs = {}  # Keys are directory paths, values are ignored.
-  source_dirs = [os.path.dirname(f) for f in files]
-  presubmit_files = []
-  for dir in source_dirs:
-    while (True):
-      if dir in checked_dirs:
-        break  # We've already walked up from this directory.
-
-      test_path = os.path.join(dir, 'PRESUBMIT.py')
-      if os.path.isfile(test_path):
-        presubmit_files.append(normpath(test_path))
-
-      checked_dirs[dir] = ''
-      if dir in ['', '.']:
+  entries = []
+  for f in files:
+    f = normpath(os.path.join(root, f))
+    while f:
+      f = os.path.dirname(f)
+      if f in entries:
         break
-      else:
-        dir = os.path.dirname(dir)
-  return presubmit_files
+      entries.append(f)
+      if f == root:
+        break
+  entries.sort()
+  entries = map(lambda x: os.path.join(x, 'PRESUBMIT.py'), entries)
+  return filter(lambda x: os.path.isfile(x), entries)
 
 
 class PresubmitExecuter(object):
   def __init__(self, change_info, committing):
     """
     Args:
       change_info: The ChangeInfo object for the change.
       committing: True if 'gcl commit' is running, False if 'gcl upload' is.
     """
     # TODO(maruel): Determine the SCM.
@@ skipping 58 matching lines @@
     change_info: The ChangeInfo object for the change.
     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.
 
   Return:
     True if execution can continue, False if not.
   """
-  presubmit_files = ListRelevantPresubmitFiles(change_info.FileList())
+  checkout_root = gcl.GetRepositoryRoot()
+  presubmit_files = ListRelevantPresubmitFiles(change_info.FileList(),
+                                               checkout_root)
   if not presubmit_files and verbose:
     output_stream.write("Warning, no presubmit.py found.\n")
   results = []
   executer = PresubmitExecuter(change_info, committing)
   if default_presubmit:
     if verbose:
       output_stream.write("Running default presubmit script.\n")
-    results += executer.ExecPresubmitScript(default_presubmit, 'PRESUBMIT.py')
+    fake_path = os.path.join(checkout_root, 'PRESUBMIT.py')
+    results += executer.ExecPresubmitScript(default_presubmit, fake_path)
   for filename in presubmit_files:
     filename = os.path.abspath(filename)
     if verbose:
       output_stream.write("Running %s\n" % filename)
     # Accept CRLF presubmit script.
     presubmit_script = gcl.ReadFile(filename, 'rU')
     results += executer.ExecPresubmitScript(presubmit_script, filename)
 
   errors = []
   notifications = []
@@ skipping 63 matching lines @@
   return not DoPresubmitChecks(gcl.ChangeInfo(name='temp', files=files),
                                options.commit,
                                options.verbose,
                                sys.stdout,
                                sys.stdin,
                                default_presubmit=None)
 
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv))