Fix per-file owners check for deleted files.

owners_finder.py

 # Copyright 2013 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.
 
 """Interactive tool for finding reviewers/owners for a change."""
 
 import os
 import copy
 import owners as owners_module
 
 
 def first(iterable):
   for element in iterable:
     return element
 
 
 class OwnersFinder(object):
   COLOR_LINK = '\033[4m'
   COLOR_BOLD = '\033[1;32m'
   COLOR_GREY = '\033[0;37m'
   COLOR_RESET = '\033[0m'
 
   indentation = 0
 
   def __init__(self, files, local_root, author,
-               fopen, os_path, glob,
+               fopen, os_path,
                email_postfix='@chromium.org',
                disable_color=False):
     self.email_postfix = email_postfix
 
     if os.name == 'nt' or disable_color:
       self.COLOR_LINK = ''
       self.COLOR_BOLD = ''
       self.COLOR_GREY = ''
       self.COLOR_RESET = ''
 
-    self.db = owners_module.Database(local_root, fopen, os_path, glob)
+    self.db = owners_module.Database(local_root, fopen, os_path)
     self.db.load_data_needed_for(files)
 
     self.os_path = os_path
 
     self.author = author
 
     filtered_files = files
 
-    # Eliminate files that author himself can review.
-    if author:
-      if author in self.db.owned_by:
-        for dir_name in self.db.owned_by[author]:
-          filtered_files = [
-              file_name for file_name in filtered_files
-              if not file_name.startswith(dir_name)]
-
-        filtered_files = list(filtered_files)
-
-    # Eliminate files that everyone can review.
-    if owners_module.EVERYONE in self.db.owned_by:
-      for dir_name in self.db.owned_by[owners_module.EVERYONE]:
-        filtered_files = filter(
-            lambda file_name: not file_name.startswith(dir_name),
-            filtered_files)
+    # Eliminate files that the author can review.
+    filtered_files = list(self.db.files_not_covered_by(
+      filtered_files, [author] if author else []))
 
     # If some files are eliminated.
     if len(filtered_files) != len(files):
       files = filtered_files
       # Reload the database.
-      self.db = owners_module.Database(local_root, fopen, os_path, glob)
+      self.db = owners_module.Database(local_root, fopen, os_path)
       self.db.load_data_needed_for(files)
 
     self.all_possible_owners = self.db.all_possible_owners(files, None)
 
     self.owners_to_files = {}
     self._map_owners_to_files(files)
 
     self.files_to_owners = {}
     self._map_files_to_owners()
 
@@ skipping 278 matching lines @@
   def print_info(self, owner):
     self.hr()
     self.writeln(
         self.bold(str(len(self.unreviewed_files))) + ' file(s) left.')
     self.print_owned_files_for(owner)
 
   def input_command(self, owner):
     self.writeln('Add ' + self.bold_name(owner) + ' as your reviewer? ')
     return raw_input(
         '[yes/no/Defer/pick/files/owners/quit/restart]: ').lower()