Remove the options.path_exists which only existed as a seam. It's not really ...

gclient.py

 #!/usr/bin/python
 #
 # Copyright 2008 Google Inc.  All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
@@ skipping 735 matching lines @@
   def update(self, options, args, file_list):
     """Runs SCM to update or transparently checkout the working copy.
 
     All updated files will be appended to file_list.
 
     Raises:
       Error: if can't get URL for relative path.
     """
     # Only update if git is not controlling the directory.
     checkout_path = os.path.join(self._root_dir, self.relpath)
-    git_path = os.path.join(checkout_path, '.git')
-    if options.path_exists(git_path):
+    git_path = os.path.join(self._root_dir, self.relpath, '.git')
+    if os.path.exists(git_path):
       print("________ found .git directory; skipping %s" % self.relpath)
       return
 
     if args:
       raise Error("Unsupported argument(s): %s" % ",".join(args))
 
     url = self.url
     components = url.split("@")
     revision = None
     forced_revision = False
     if options.revision:
       # Override the revision number.
       url = '%s@%s' % (components[0], str(options.revision))
       revision = int(options.revision)
       forced_revision = True
     elif len(components) == 2:
       revision = int(components[1])
       forced_revision = True
 
     rev_str = ""
     if revision:
       rev_str = ' at %d' % revision
 
-    if not options.path_exists(checkout_path):
+    if not os.path.exists(checkout_path):
       # We need to checkout.
       command = ['checkout', url, checkout_path]
       if revision:
         command.extend(['--revision', str(revision)])
       RunSVNAndGetFileList(command, self._root_dir, file_list)
       return
 
     # Get the existing scm url and the revision number of the current checkout.
     from_info = CaptureSVNInfo(os.path.join(checkout_path, '.'), '.')
 
@@ skipping 166 matching lines @@
     """Searches for and loads a .gclient file relative to the current working
     dir.
 
     Returns:
       A dict representing the contents of the .gclient file or an empty dict if
       the .gclient file doesn't exist.
     """
     if not from_dir:
       from_dir = os.curdir
     path = os.path.realpath(from_dir)
-    while not options.path_exists(os.path.join(path, options.config_filename)):
+    while not os.path.exists(os.path.join(path, options.config_filename)):
       next = os.path.split(path)
       if not next[1]:
         return None
       path = next[0]
     client = options.gclient(path, options)
     client._LoadConfig()
     return client
 
   def SetDefaultConfig(self, solution_name, solution_url, safesync_url):
     self.SetConfig(DEFAULT_CLIENT_FILE_TEXT % (
@@ skipping 20 matching lines @@
 
     Args:
       client: The client for which the entries file should be read.
 
     Returns:
       A sequence of solution names, which will be empty if there is the
       entries file hasn't been created yet.
     """
     scope = {}
     filename = os.path.join(self._root_dir, self._options.entries_filename)
-    if not self._options.path_exists(filename):
+    if not os.path.exists(filename):
       return []
     exec(FileRead(filename), scope)
     return scope["entries"]
 
   class FromImpl:
     """Used to implement the From syntax."""
 
     def __init__(self, module_name):
       self.module_name = module_name
 
@@ skipping 309 matching lines @@
     is_using_git = IsUsingGit(self._root_dir, entries.keys())
     self._RunHooks(command, file_list, is_using_git)
 
     if command == 'update':
       # notify the user if there is an orphaned entry in their working copy.
       # TODO(darin): we should delete this directory manually if it doesn't
       # have any changes in it.
       prev_entries = self._ReadEntries()
       for entry in prev_entries:
         e_dir = os.path.join(self._root_dir, entry)
-        if entry not in entries and self._options.path_exists(e_dir):
+        if entry not in entries and os.path.exists(e_dir):
           if CaptureSVNStatus(e_dir):
             # There are modified files in this entry
             entries[entry] = None  # Keep warning until removed.
             print("\nWARNING: \"%s\" is no longer part of this client.  "
                   "It is recommended that you manually remove it.\n") % entry
           else:
             # Delete the entry
             print("\n________ deleting \'%s\' " +
                   "in \'%s\'") % (entry, self._root_dir)
             RemoveDirectory(e_dir)
@@ skipping 131 matching lines @@
   Args:
     options: If options.spec set, a string providing contents of config file.
     args: The command line args.  If spec is not set,
           then args[0] is a string URL to get for config file.
 
   Raises:
     Error: on usage error
   """
   if len(args) < 1 and not options.spec:
     raise Error("required argument missing; see 'gclient help config'")
-  if options.path_exists(options.config_filename):
+  if os.path.exists(options.config_filename):
     raise Error("%s file already exists in the current directory" %
                 options.config_filename)
   client = options.gclient('.', options)
   if options.spec:
     client.SetConfig(options.spec)
   else:
     # TODO(darin): it would be nice to be able to specify an alternate relpath
     # for the given URL.
     base_url = args[0]
     name = args[0].split("/")[-1]
@@ skipping 204 matching lines @@
 
   if len(argv) < 3 and command == "help":
     option_parser.print_help()
     return 0
 
   # Files used for configuration and state saving.
   options.config_filename = os.environ.get("GCLIENT_FILE", ".gclient")
   options.entries_filename = ".gclient_entries"
   options.deps_file = "DEPS"
 
-  options.path_exists = os.path.exists
   options.gclient = GClient
   options.scm_wrapper = SCMWrapper
   options.platform = sys.platform
   return DispatchCommand(command, options, args)
 
 
 if "__main__" == __name__:
   try:
     result = Main(sys.argv)
   except Error, e:
     print >> sys.stderr, "Error: %s" % str(e)
     result = 1
   sys.exit(result)
 
 # vim: ts=2:sw=2:tw=80:et: