Show a list of directories missing OWNER reviewers on upload, and show directories rather than file…

owners.py

 # Copyright (c) 2010 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.
 
 """A database of OWNERS files."""
 
 import collections
 import re
 
 
@@ skipping 57 matching lines @@
     self.stop_looking = set([''])
 
   def reviewers_for(self, files):
     """Returns a suggested set of reviewers that will cover the files.
 
     files is a sequence of paths relative to (and under) self.root."""
     self._check_paths(files)
     self._load_data_needed_for(files)
     return self._covering_set_of_owners_for(files)
 
   def files_are_covered_by(self, files, reviewers):

[Dirk Pranke, 2012/03/08 07:19:48]

I meant that I don't think anyone calls this routine at all, so you can just
delete it.

-    """Returns whether every file is owned by at least one reviewer."""
-    return not self.files_not_covered_by(files, reviewers)
+    """Returns whether every file is owned by at least one reviewer.
 
-  def files_not_covered_by(self, files, reviewers):
-    """Returns the set of files that are not owned by at least one reviewer.
+    If reviewers is empty, returns False if there are any files at all.
+    """
+    if files and not reviewers:
+      return False
+    return not self.directories_not_covered_by(files, reviewers)
+
+  def directories_not_covered_by(self, files, reviewers):
+    """Returns the set of directories that are not owned by a reviewer.
+
+    Determines which of the given files are not owned by at least one of the
+    reviewers, then returns a set containing the applicable enclosing
+    directories, i.e. the ones upward from the files that have OWNERS files.
 
     Args:
         files is a sequence of paths relative to (and under) self.root.
-        reviewers is a sequence of strings matching self.email_regexp."""
+        reviewers is a sequence of strings matching self.email_regexp.
+    """
     self._check_paths(files)
     self._check_reviewers(reviewers)
-    if not reviewers:
-      return files
 
     self._load_data_needed_for(files)
     files_by_dir = self._files_by_dir(files)

[Dirk Pranke, 2012/03/08 07:19:48]

You no longer need the files, just the dirs, so you can do:

dirs = self._files_by_dir(files).keys()
covered_dirs = self._dirs_covered_by(reviewers)
uncovered_dirs = filter(lambda d: not self._is_dir_covered_by(d, covered_dirs,
dirs)
return set(self._enclosing_dir_with_owners(d) for d in uncovered_dirs)

(or something like it).

[Pam (message me for reviews), 2012/03/08 09:11:54]

Thanks, I should have seen that. No more coding at midnight for me.

I took out _files_by_dir(), too, since it's also no longer needed.

     covered_dirs = self._dirs_covered_by(reviewers)
-    uncovered_files = []
+    uncovered_dirs = []
     for d, files_in_d in files_by_dir.iteritems():
       if not self._is_dir_covered_by(d, covered_dirs):
-        uncovered_files.extend(files_in_d)
-    return set(uncovered_files)
+        uncovered_dirs.append(self._enclosing_dir_with_owners(d))
+    return set(uncovered_dirs)
 
   def _check_paths(self, files):
     def _is_under(f, pfx):
       return self.os_path.abspath(self.os_path.join(pfx, f)).startswith(pfx)
     _assert_is_collection(files)
     assert all(_is_under(f, self.os_path.abspath(self.root)) for f in files)
 
   def _check_reviewers(self, reviewers):
     _assert_is_collection(reviewers)
     assert all(self.email_regexp.match(r) for r in reviewers)
@@ skipping 11 matching lines @@
     return dirs
 
   def _stop_looking(self, dirname):
     return dirname in self.stop_looking
 
   def _is_dir_covered_by(self, dirname, covered_dirs):
     while not dirname in covered_dirs and not self._stop_looking(dirname):
       dirname = self.os_path.dirname(dirname)
     return dirname in covered_dirs
 
+  def _enclosing_dir_with_owners(self, directory):
+    """Returns the innermost enclosing directory that has an OWNERS file."""
+    dirpath = directory
+    while not dirpath in self.owners_for:
+      if self._stop_looking(dirpath):
+        break
+      dirpath = self.os_path.dirname(dirpath)
+    return dirpath
+
   def _load_data_needed_for(self, files):
     for f in files:
       dirpath = self.os_path.dirname(f)
       while not dirpath in self.owners_for:
         self._read_owners_in_dir(dirpath)
         if self._stop_looking(dirpath):
           break
         dirpath = self.os_path.dirname(dirpath)
 
   def _read_owners_in_dir(self, dirpath):
@@ skipping 27 matching lines @@
     # short combinations of owners.
     every_owner = set()
     for f in files:
       dirname = self.os_path.dirname(f)
       while dirname in self.owners_for:
         every_owner |= self.owners_for[dirname]
         if self._stop_looking(dirname):
           break
         dirname = self.os_path.dirname(dirname)
     return every_owner