Modify gcl lint to pull the IGNORE_PATH from codereview.settings rather than...

gcl.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.
 #
 # Wrapper script around Rietveld's upload.py that groups files into
 # changelists.
 
 import getpass
 import os
@@ skipping 114 matching lines @@
 
 
 def GetCachedFile(filename, max_age=60*60*24*3, use_root=False):
   """Retrieves a file from the repository and caches it in GetCacheDir() for
   max_age seconds.
 
   use_root: If False, look up the arborescence for the first match, otherwise go
             directory to the root repository.
 
   Note: The cache will be inconsistent if the same file is retrieved with both
-        use_root=True and use_root=False on the same file. Don't be stupid.
+        use_root=True and use_root=False. Don't be stupid.
   """
   global FILES_CACHE
   if filename not in FILES_CACHE:
     # Don't try to look up twice.
     FILES_CACHE[filename] = None
     # First we check if we have a cached version.
     try:
       cached_file = os.path.join(GetCacheDir(), filename)
     except gclient_utils.Error:
       return None
     if (not os.path.exists(cached_file) or
         os.stat(cached_file).st_mtime > max_age):
       dir_info = gclient_scm.CaptureSVNInfo(".")
       repo_root = dir_info["Repository Root"]
       if use_root:
         url_path = repo_root
       else:
         url_path = dir_info["URL"]
       content = ""
       while True:
-        # Look for the codereview.settings file at the current level.
-        svn_path = url_path + "/" + filename
-        content, rc = RunShellWithReturnCode(["svn", "cat", svn_path])
+        # First, look for a locally modified version of codereview.settings.
+        content, rc = RunShellWithReturnCode(["svn", "status", filename])
+        if not rc and content.startswith('M'):
+          content = ReadFile(filename)
+          rc = 0
+        else:
+          # Then look in the repository
+          svn_path = url_path + "/" + filename
+          content, rc = RunShellWithReturnCode(["svn", "cat", svn_path])
+
         if not rc:
           # Exit the loop if the file was found. Override content.
           break
         # Make sure to mark settings as empty if not found.
         content = ""
         if url_path == repo_root:
           # Reached the root. Abandoning search.
           break
         # Go up one level to try again.
         url_path = os.path.dirname(url_path)
@@ skipping 901 matching lines @@
 
   change_info.Save()
   print change_info.name + " changelist saved."
   if change_info.MissingTests():
     Warn("WARNING: " + MISSING_TEST_MSG)
 
 # We don't lint files in these path prefixes.
 IGNORE_PATHS = (os.path.join("webkit","api"),)
 
 # Valid extensions for files we want to lint.
-CPP_EXTENSIONS = ("cpp", "cc", "h")
+LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
+LINT_IGNORE_REGEX = r""
 
 def Lint(change_info, args):
   """Runs cpplint.py on all the files in |change_info|"""
   try:
     import cpplint
   except ImportError:
     ErrorExit("You need to install cpplint.py to lint C++ files.")
 
   # Change the current working directory before calling lint so that it
   # shows the correct base.
   previous_cwd = os.getcwd()
   os.chdir(change_info.GetLocalRoot())
 
   # Process cpplints arguments if any.
   filenames = cpplint.ParseArguments(args + change_info.GetFileNames())
 
+  white_list = GetCodeReviewSetting("LINT_REGEX")
+  if not white_list:
+    white_list = LINT_REGEX
+  white_regex = re.compile(white_list)
+  black_list = GetCodeReviewSetting("LINT_IGNORE_REGEX")
+  if not black_list:
+    black_list = LINT_IGNORE_REGEX
+  black_regex = re.compile(black_list)
   for file in filenames:
-    if len([file for suffix in CPP_EXTENSIONS if file.endswith(suffix)]):
-      if len([file for prefix in IGNORE_PATHS if file.startswith(prefix)]):
-        print "Ignoring non-Google styled file %s" % file
+    if white_regex.match(file):
+      if black_regex.match(file):
+        print "Ignoring file %s" % file
       else:
         cpplint.ProcessFile(file, cpplint._cpplint_state.verbose_level)
+    else:
+      print "Skipping file %s" % file
 
   print "Total errors found: %d\n" % cpplint._cpplint_state.error_count
   os.chdir(previous_cwd)
 
 
 def DoPresubmitChecks(change_info, committing, may_prompt):
   """Imports presubmit, then calls presubmit.DoPresubmitChecks."""
   # Need to import here to avoid circular dependency.
   import presubmit_support
   root_presubmit = GetCachedFile('PRESUBMIT.py', use_root=True)
@@ skipping 138 matching lines @@
     # the files. This allows commands such as 'gcl diff xxx' to work.
     args =["svn", command]
     root = GetRepositoryRoot()
     args.extend([os.path.join(root, x) for x in change_info.GetFileNames()])
     RunShell(args, True)
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(main())