Fix looking for local versions of cached files

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 96 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 = SVN.CaptureInfo(".")
       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 the file if we can.
-        r = ""
-        if not use_root:
-          local_path = os.path.join(local_dir, local_base)
-          r = SVN.CaptureStatus((local_path,))
-        rc = -1
-        if r:
-          status = r[0][0]
-          rc = 0
-        if not rc and status[0] in ('A','M'):
-          content = ReadFile(local_path)
-          rc = 0
-        else:
-          # Look in the repository if we didn't find something local.
-          svn_path = url_path + "/" + filename
-          content, rc = RunShellWithReturnCode(["svn", "cat", svn_path])
-
+        # Look in the repository at the current level for the file.
+        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_file)
     # Keep the content cached in memory.
     FILES_CACHE[filename] = content
   return FILES_CACHE[filename]
 
 
@@ skipping 1118 matching lines @@
       return 0
     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())