Pass through "--filter" arguments from "git cl lint" to cpplint.py

git_cl.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.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld."""
 
 from distutils.version import LooseVersion
@@ skipping 1364 matching lines @@
     log_args = [args[0][:-1]]
   elif len(args) == 2:
     log_args = [args[0] + '..' + args[1]]
   else:
     log_args = args[:]  # Hope for the best!
   return RunGit(['log', '--pretty=format:%s\n\n%b'] + log_args)
 
 
 def CMDlint(parser, args):
   """Runs cpplint on the current changelist."""
-  _, args = parser.parse_args(args)
+  parser.add_option('--filter', action='append', default=[], metavar='-x,+y',
+                    help='Comma-separated list of cpplint\'s category-filters')
+  (options, args) = parser.parse_args(args)
 
   # Access to a protected member _XX of a client class
   # pylint: disable=W0212
   try:
     import cpplint
     import cpplint_chromium
   except ImportError:
     print "Your depot_tools is missing cpplint.py and/or cpplint_chromium.py."
     return 1
 
   # Change the current working directory before calling lint so that it
   # shows the correct base.
   previous_cwd = os.getcwd()
   os.chdir(settings.GetRoot())
   try:
     cl = Changelist()
     change = cl.GetChange(cl.GetCommonAncestorWithUpstream(), None)
     files = [f.LocalPath() for f in change.AffectedFiles()]
 
     # Process cpplints arguments if any.
-    filenames = cpplint.ParseArguments(args + files)
+    filenames = cpplint.ParseArguments(
+      ['--filter=' + ','.join(options.filter)] + args + files)

[Nico, 2014/03/13 04:21:18]

if options.filter has its default value of [], this will pass

  ['--filter='] + args

which probably doesn't do the right thing, does it? Maybe

  command = args + files
  if options.filter
    command = ['--filter + ','.join...] + command
  ParseArguments(command)

is better?

[tzik, 2014/03/13 04:35:58]

Ah, right. Absence of "--filter" means different than just "--filter=".
Fixed.

 
     white_regex = re.compile(settings.GetLintRegex())
     black_regex = re.compile(settings.GetLintIgnoreRegex())
     extra_check_functions = [cpplint_chromium.CheckPointerDeclarationWhitespace]
     for filename in filenames:
       if white_regex.match(filename):
         if black_regex.match(filename):
           print "Ignoring file %s" % filename
         else:
           cpplint.ProcessFile(filename, cpplint._cpplint_state.verbose_level,
@@ skipping 1109 matching lines @@
         ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
           'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
 
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   colorama.init()
   sys.exit(main(sys.argv[1:]))