Remove presubmit warning for long lines in .grd files

The presubmit check complained about long lines in .grd files. This isn't a useful warning since .grd files aren't really source files.

The problem was that callers were passing in a file filter to InputApi.AffectedFiles but it was being ignored. Fix was to use the passed in file filter.

BUG=None
TEST=Ran on a local change and verified that I no longer got long line warnings on .grd files.
Review URL: http://codereview.chromium.org/6932060

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@85148 0039d316-1c4b-4281-b951-d872f2087c98

presubmit_canned_checks.py

@@ -153,7 +153,7 @@ def CheckSvnModifiedDirectories(input_api, output_api, source_file_filter=None):
   modified_files = [f for f in all_modified_files if f not in current_cl_files]
   modified_abspaths = [input_api.os_path.abspath(f) for f in modified_files]
 
-  for f in input_api.AffectedFiles(source_file_filter):
+  for f in input_api.AffectedFiles(file_filter=source_file_filter):
     if f.Action() == 'M' and f.IsDirectory():
       curpath = f.AbsoluteLocalPath()
       bad_files = []
@@ -236,7 +236,8 @@ def _FindNewViolationsOfRule(callable_rule, input_api, source_file_filter=None,
     A list of the newly-introduced violations reported by the rule.
   """
   errors = []
-  for f in input_api.AffectedFiles(source_file_filter, include_deletes=False):
+  for f in input_api.AffectedFiles(include_deletes=False,
+                                   file_filter=source_file_filter):
     # For speed, we do two passes, checking first the full file.  Shelling out
     # to the SCM to determine the changed region can be quite expensive on
     # Win32.  Assuming that most files will be kept problem-free, we can
@@ -733,7 +734,7 @@ def CheckOwners(input_api, output_api, source_file_filter=None):
         "we can't check it for approvals.")]
 
   affected_files = set([f.LocalPath() for f in
-      input_api.change.AffectedFiles(source_file_filter)])
+      input_api.change.AffectedFiles(file_filter=source_file_filter)])
 
   owners_db = input_api.owners_db
   owner_email, approvers = _RietveldOwnerAndApprovers(input_api,

presubmit_support.py

@@ -314,7 +314,8 @@ class InputApi(object):
     if depot_path:
       return depot_path
 
-  def AffectedFiles(self, include_dirs=False, include_deletes=True):
+  def AffectedFiles(self, include_dirs=False, include_deletes=True,
+                    file_filter=None):
     """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.
@@ -322,9 +323,10 @@ class InputApi(object):
     dir_with_slash = normpath("%s/" % self.PresubmitLocalPath())
     if len(dir_with_slash) == 1:
       dir_with_slash = ''
+
     return filter(
         lambda x: normpath(x.AbsoluteLocalPath()).startswith(dir_with_slash),
-        self.change.AffectedFiles(include_dirs, include_deletes))
+        self.change.AffectedFiles(include_dirs, include_deletes, file_filter))
 
   def LocalPaths(self, include_dirs=False):
     """Returns local paths of input_api.AffectedFiles()."""
@@ -715,12 +717,14 @@ class Change(object):
       raise AttributeError(self, attr)
     return self.tags.get(attr)
 
-  def AffectedFiles(self, include_dirs=False, include_deletes=True):
+  def AffectedFiles(self, include_dirs=False, include_deletes=True,
+                    file_filter=None):
     """Returns a list of AffectedFile instances for all files in the change.
 
     Args:
       include_deletes: If false, deleted files will be filtered out.
       include_dirs: True to include directories in the list
+      file_filter: An additional filter to apply.
 
     Returns:
       [AffectedFile(path, action), AffectedFile(path, action)]
@@ -730,6 +734,8 @@ class Change(object):
     else:
       affected = filter(lambda x: not x.IsDirectory(), self._affected_files)
 
+    affected = filter(file_filter, affected)
+
     if include_deletes:
       return affected
     else:

tests/presubmit_unittest.py

@@ -1392,8 +1392,9 @@ class CannedChecksUnittest(PresubmitTestsBase):
         'foo1', 'foo1\n', self.fake_root_dir, None, 0, 0, None)
     input_api1 = self.MockInputApi(change1, False)
     affected_file = self.mox.CreateMock(presubmit.SvnAffectedFile)
-    input_api1.AffectedFiles(mox.IgnoreArg(), include_deletes=False).AndReturn(
-        [affected_file])
+    input_api1.AffectedFiles(
+        include_deletes=False,
+        file_filter=mox.IgnoreArg()).AndReturn([affected_file])
     affected_file.NewContents().AndReturn([
         'ahoy',
         'yo' + content1,
@@ -1405,8 +1406,9 @@ class CannedChecksUnittest(PresubmitTestsBase):
         'foo2', 'foo2\n', self.fake_root_dir, None, 0, 0, None)
     input_api2 = self.MockInputApi(change2, False)
 
-    input_api2.AffectedFiles(mox.IgnoreArg(), include_deletes=False).AndReturn(
-        [affected_file])
+    input_api2.AffectedFiles(
+        include_deletes=False,
+        file_filter=mox.IgnoreArg()).AndReturn([affected_file])
     affected_file.NewContents().AndReturn([
         'ahoy',
         'yo' + content2,
@@ -1596,10 +1598,10 @@ class CannedChecksUnittest(PresubmitTestsBase):
     affected_files = (affected_file1, affected_file2,
                       affected_file3, affected_file4)
 
-    def test(source_filter, include_deletes):
+    def test(file_filter, include_deletes):
       self.assertFalse(include_deletes)
       for x in affected_files:
-        if source_filter(x):
+        if file_filter(x):
           yield x
     # Override the mock of these functions.
     input_api1.FilterSourceFile = lambda x: x
@@ -1718,7 +1720,7 @@ class CannedChecksUnittest(PresubmitTestsBase):
     affected_file.IsDirectory().AndReturn(True)
     affected_file.AbsoluteLocalPath().AndReturn(accidental_submssion_file)
     affected_file.LocalPath().AndReturn(accidental_submssion_file)
-    input_api.AffectedFiles(None).AndReturn([affected_file])
+    input_api.AffectedFiles(file_filter=None).AndReturn([affected_file])
 
     self.mox.ReplayAll()
 
@@ -1996,7 +1998,7 @@ mac|success|blew
 
     if not tbr and issue:
       affected_file.LocalPath().AndReturn('foo.cc')
-      change.AffectedFiles(None).AndReturn([affected_file])
+      change.AffectedFiles(file_filter=None).AndReturn([affected_file])
 
       expected_host = 'http://localhost'
       if host_url: