Fix gclient on posix platforms....

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 21 matching lines @@
 # we store information about changelists.
 repository_root = ""
 gcl_info_dir = ""
 
 # Filename where we store repository specific information for gcl.
 CODEREVIEW_SETTINGS_FILE = "codereview.settings"
 
 # Warning message when the change appears to be missing tests.
 MISSING_TEST_MSG = "Change contains new or modified methods, but no new tests!"
 
-# Global cache of files cached in GetInfoDir().
-FILES_CACHE = {}
+# Caches whether we read the codereview.settings file yet or not.
+read_gcl_info = False
 
 
 def IsSVNMoved(filename):
   """Determine if a file has been added through svn mv"""
   info = GetSVNFileInfo(filename)
   return (info.get('Copied From URL') and
           info.get('Copied From Rev') and
           info.get('Schedule') == 'add')
 
 
@@ skipping 50 matching lines @@
 
 
 def GetInfoDir():
   """Returns the directory where gcl info files are stored."""
   global gcl_info_dir
   if not gcl_info_dir:
     gcl_info_dir = os.path.join(GetRepositoryRoot(), '.svn', 'gcl_info')
   return gcl_info_dir
 
 
-def GetCachedFile(filename, max_age=60*60*24*3, use_root=False):
-  """Retrieves a file from the repository and caches it in GetInfoDir() for
-  max_age seconds.
-
-  use_root: If False, look up the arborescence for the first match, otherwise go
-            directory to the root repository.
-  """
-  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.
-    cached_file = os.path.join(GetInfoDir(), filename)
-    if (not os.path.exists(cached_file) or
-        os.stat(cached_file).st_mtime > max_age):
-      dir_info = GetSVNFileInfo(".")
-      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])
-        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)
-      # 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)
-    FILES_CACHE[filename] = content
-  return FILES_CACHE[filename]
-
-
 def GetCodeReviewSetting(key):
   """Returns a value for the given key for this repository."""
-  # Use '__just_initialized' as a flag to determine if the settings were
-  # already initialized.
-  if '__just_initialized' not in CODEREVIEW_SETTINGS:
-    for line in GetCachedFile(CODEREVIEW_SETTINGS_FILE).splitlines():
+  global read_gcl_info
+  if not read_gcl_info:
+    read_gcl_info = True
+    # First we check if we have a cached version.
+    cached_settings_file = os.path.join(GetInfoDir(), CODEREVIEW_SETTINGS_FILE)
+    if (not os.path.exists(cached_settings_file) or
+        os.stat(cached_settings_file).st_mtime > 60*60*24*3):
+      dir_info = GetSVNFileInfo(".")
+      repo_root = dir_info["Repository Root"]
+      url_path = dir_info["URL"]
+      settings = ""
+      while True:
+        # Look for the codereview.settings file at the current level.
+        svn_path = url_path + "/" + CODEREVIEW_SETTINGS_FILE
+        settings, rc = RunShellWithReturnCode(["svn", "cat", svn_path])
+        if not rc:
+          # Exit the loop if the file was found.
+          break
+        # Make sure to mark settings as empty if not found.
+        settings = ""
+        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)
+
+      # Write a cached version even if there isn't a file, so we don't try to
+      # fetch it each time.
+      WriteFile(cached_settings_file, settings)
+
+    output = ReadFile(cached_settings_file)
+    for line in output.splitlines():
       if not line or line.startswith("#"):
         continue
       k, v = line.split(": ", 1)
       CODEREVIEW_SETTINGS[k] = v
-    CODEREVIEW_SETTINGS.setdefault('__just_initialized', None)
   return CODEREVIEW_SETTINGS.get(key, "")
 
 
 def IsTreeOpen():
   """Fetches the tree status and returns either True or False."""
   url = GetCodeReviewSetting('STATUS')
   status = ""
   if url:
     status = urllib2.urlopen(url).read()
   return status.find('0') == -1
@@ skipping 414 matching lines @@
 Basic commands:
 -----------------------------------------
    gcl change change_name
       Add/remove files to a changelist. Only scans the current directory and
       subdirectories.
 
    gcl upload change_name [-r reviewer1@gmail.com,reviewer2@gmail.com,...]
                           [--send_mail] [--no_try] [--no_presubmit]
       Uploads the changelist to the server for review.
 
-   gcl commit change_name [--no_presubmit] [--force]
+   gcl commit change_name [--force]
       Commits the changelist to the repository.
 
    gcl lint change_name
       Check all the files in the changelist for possible style violations.
 
 Advanced commands:
 -----------------------------------------
    gcl delete change_name
       Deletes a changelist.
 
@@ skipping 388 matching lines @@
 
 
 def DoPresubmitChecks(change_info, committing):
   """Imports presubmit, then calls presubmit.DoPresubmitChecks."""
   # Need to import here to avoid circular dependency.
   import presubmit
   result = presubmit.DoPresubmitChecks(change_info,
                                        committing,
                                        verbose=False,
                                        output_stream=sys.stdout,
-                                       input_stream=sys.stdin,
-                                       default_presubmit=
-                                          GetCachedFile('PRESUBMIT.py',
-                                                        use_root=True))
+                                       input_stream=sys.stdin)
   if not result:
     print "\nPresubmit errors, can't continue (use --no_presubmit to bypass)"
   return result
 
 
 def Changes():
   """Print all the changelists and their files."""
   for cl in GetCLs():
     change_info = LoadChangelistInfo(cl, True, True)
     print "\n--- Changelist " + change_info.name + ":"
@@ skipping 86 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.FileList()])
     RunShell(args, True)
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(main())