Revise change in r30415 to properly climb local directories looking for a ...

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 127 matching lines @@
   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):
+      local_dir = os.path.dirname(os.path.abspath(filename))
+      local_base = os.path.basename(filename)
       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:
-        # First, look for a locally modified version of codereview.settings.
-        content, rc = RunShellWithReturnCode(["svn", "status", filename])
+        # First, look for a locally modified version of the file.
+        local_path = os.path.join(local_dir, local_base)
+        content, rc = RunShellWithReturnCode(["svn", "status", local_path])
         if not rc and content.startswith('M'):
-          content = ReadFile(filename)
+          content = ReadFile(local_path)
           rc = 0
         else:
-          # Then look in the repository
+          # 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)
+        local_dir = os.path.dirname(local_dir)
       # Write a cached version even if there isn't a file, so we don't try to
       # fetch it each time.
       WriteFile(cached_file, content)
     else:
       content = ReadFile(cached_settings_file)
     # Keep the content cached in memory.
     FILES_CACHE[filename] = content
   return FILES_CACHE[filename]
 
 
@@ skipping 887 matching lines @@
       (not len(new_description) and (not new_cl_files)):
     ErrorExit("Empty changelist not saved")
 
   change_info._files = new_cl_files
 
   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.
-LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
-LINT_IGNORE_REGEX = r""
+DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
+DEFAULT_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_list = DEFAULT_LINT_REGEX
   white_regex = re.compile(white_list)
   black_list = GetCodeReviewSetting("LINT_IGNORE_REGEX")
   if not black_list:
-    black_list = LINT_IGNORE_REGEX
+    black_list = DEFAULT_LINT_IGNORE_REGEX
   black_regex = re.compile(black_list)
   for file in filenames:
     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
 
@@ skipping 147 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())