From fa44e4aef229a15e11fbb3306f590d5757995894 Mon Sep 17 00:00:00 2001 From: "dpranke@google.com" Date: Thu, 3 Dec 2009 01:41:13 +0000 Subject: [PATCH] Revert changes to GetCachedFile() in r30414, r30910, r31586, and go back to the behavior before I started messing with it. It turns out it's not worth the hassle to try and "clean this up"; we depend on the current convoluted semantics, which is to crawl up the tree from the current dir looking for codereview.settings files, but to only ever look for PRESUBMIT.py in the root of the repo. Trying to unify the logic seems to be too painful. BUG=none R=maruel@chromium.org TEST=none Review URL: http://codereview.chromium.org/387067 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@33648 0039d316-1c4b-4281-b951-d872f2087c98 --- gcl.py | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/gcl.py b/gcl.py index e4b50859d6..4a61b4cbdb 100755 --- a/gcl.py +++ b/gcl.py @@ -114,8 +114,6 @@ def GetCachedFile(filename, max_age=60*60*24*3, use_root=False): 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: @@ -124,23 +122,9 @@ def GetCachedFile(filename, max_age=60*60*24*3, use_root=False): 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 @@ -151,7 +135,6 @@ def GetCachedFile(filename, max_age=60*60*24*3, use_root=False): 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)