Revert 32057, 32058, 32059, 32062 because they still have unwanted side-effects.

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 48 matching lines @@
                by the list of matching files.
 
   Example:
     hooks = [
       { "pattern": "\\.(gif|jpe?g|pr0n|png)$",
         "action":  ["python", "image_indexer.py", "--all"]},
     ]
 """
 
 __author__ = "darinf@gmail.com (Darin Fisher)"
-__version__ = "0.3.4"
+__version__ = "0.3.3"
 
 import errno
 import logging
 import optparse
 import os
 import pprint
 import re
 import sys
 import urlparse
 import urllib
@@ skipping 660 matching lines @@
       # Only delete the directory if there are no changes in it, and
       # delete_unversioned_trees is set to true.
       prev_entries = self._ReadEntries()
       for entry in prev_entries:
         # Fix path separator on Windows.
         entry_fixed = entry.replace('/', os.path.sep)
         e_dir = os.path.join(self._root_dir, entry_fixed)
         # Use entry and not entry_fixed there.
         if entry not in entries and os.path.exists(e_dir):
           modified_files = False
-          if isinstance(prev_entries, list):
+          if isinstance(prev_entries,list):
             # old .gclient_entries format was list, now dict
-            modified_files = gclient_scm.scm.SVN.CaptureStatus(e_dir)
+            modified_files = gclient_scm.CaptureSVNStatus(e_dir)
           else:
             file_list = []
             scm = gclient_scm.CreateSCM(prev_entries[entry], self._root_dir,
                                         entry_fixed)
             scm.status(self._options, [], file_list)
             modified_files = file_list != []
           if not self._options.delete_unversioned_trees or modified_files:
             # There are modified files in this entry. Keep warning until
             # removed.
             print(("\nWARNING: \"%s\" is no longer part of this client.  "
@@ skipping 60 matching lines @@
           return (url, revision)
 
     # Run on the base solutions first.
     for solution in solutions:
       name = solution["name"]
       if name in entries:
         raise gclient_utils.Error("solution %s specified more than once" % name)
       (url, rev) = GetURLAndRev(name, solution["url"])
       entries[name] = "%s@%s" % (url, rev)
       # TODO(aharper): SVN/SCMWrapper cleanup (non-local commandset)
-      entries_deps_content[name] = gclient_scm.scm.SVN.Capture(
+      entries_deps_content[name] = gclient_scm.CaptureSVN(
                                      ["cat",
                                       "%s/%s@%s" % (url,
                                                     self._options.deps_file,
                                                     rev)],
                                      os.getcwd())
 
     # Process the dependencies next (sort alphanumerically to ensure that
     # containing directories get populated first and for readability)
     deps = self._ParseAllDeps(entries, entries_deps_content)
     deps_to_process = deps.keys()
@@ skipping 336 matching lines @@
 
 if "__main__" == __name__:
   try:
     result = Main(sys.argv)
   except gclient_utils.Error, e:
     print >> sys.stderr, "Error: %s" % str(e)
     result = 1
   sys.exit(result)
 
 # vim: ts=2:sw=2:tw=80:et: