commit ce2fccbdc1aba6a9ce9a1e0f67d092c91594c9d8
author szager@chromium.org <szager@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri May 02 00:57:10 2014 +0000
committer szager@chromium.org <szager@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri May 02 00:57:10 2014 +0000
tree 20e80407568394017769bce78a256bd1f0a93319
parent 9c0f85130ebb41ac68daf6f877605b7f7c106d73

self._Capture -> scm.GIT.Capture.

This is a special case where we want to run a git command, even if
it's an SVNWrapper instance.

R=iannucci@chromium.org,agable@chromium.org
BUG=369145

Review URL: https://codereview.chromium.org/264913006

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@267707 0039d316-1c4b-4281-b951-d872f2087c98

gclient_scm.py

diff --git a/gclient_scm.py b/gclient_scm.py
index 12450a7..e17702c 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -161,7 +161,7 @@
     """Attempt to determine the remote URL for this SCMWrapper."""
     # Git
     if os.path.exists(os.path.join(self.checkout_path, '.git')):
-      actual_remote_url = shlex.split(self._Capture(
+      actual_remote_url = shlex.split(scm.GIT.Capture(
           ['config', '--local', '--get-regexp', r'remote.*.url'],
           cwd=self.checkout_path))[1]
 
@@ -171,7 +171,7 @@
         mirror = git_cache.Mirror(url)
         if (mirror.exists() and mirror.mirror_path.replace('\\', '/') ==
             actual_remote_url.replace('\\', '/')):
-          actual_remote_url = shlex.split(self._Capture(
+          actual_remote_url = shlex.split(scm.GIT.Capture(
               ['config', '--local', '--get-regexp', r'remote.*.url'],
               cwd=mirror.mirror_path))[1]
       return actual_remote_url