Fix GetCachedFile(use_root=True)...

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 137 matching lines @@
       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 the file.
-        local_path = os.path.join(local_dir, local_base)
-        r = gclient_scm.CaptureSVNStatus((local_path,))
+        # 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 = gclient_scm.CaptureSVNStatus((local_path,))
         rc = -1
         if r:
           (status, file) = r[0]
           rc = 0
         if not rc and status[0] in ('A','M'):
           content = ReadFile(local_path)
           rc = 0
         else:
-          # Then look in the repository.
+          # Look in the repository if we didn't find something local.
           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.
@@ skipping 1105 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())