Reapply 32057, 32058, 32059, 32062 and fixes problems introduced by these changes.
Noteworthy change is scm.SVN.GetFileProperty calls Capture instead of Run.
TEST=unit tests
BUG=none
Review URL: http://codereview.chromium.org/399009
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@32181 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/gclient.py b/gclient.py
index 86d10f4..9edadc2 100755
--- a/gclient.py
+++ b/gclient.py
@@ -66,7 +66,7 @@
"""
__author__ = "[email protected] (Darin Fisher)"
-__version__ = "0.3.3"
+__version__ = "0.3.4"
import errno
import logging
@@ -747,9 +747,9 @@
# 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.CaptureSVNStatus(e_dir)
+ modified_files = gclient_scm.scm.SVN.CaptureStatus(e_dir)
else:
file_list = []
scm = gclient_scm.CreateSCM(prev_entries[entry], self._root_dir,
@@ -830,7 +830,7 @@
(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.CaptureSVN(
+ entries_deps_content[name] = gclient_scm.scm.SVN.Capture(
["cat",
"%s/%s@%s" % (url,
self._options.deps_file,
