Commit ce2fccbd authored by szager@chromium.org's avatar szager@chromium.org

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
parent 9c0f8513
...@@ -161,7 +161,7 @@ class SCMWrapper(object): ...@@ -161,7 +161,7 @@ class SCMWrapper(object):
"""Attempt to determine the remote URL for this SCMWrapper.""" """Attempt to determine the remote URL for this SCMWrapper."""
# Git # Git
if os.path.exists(os.path.join(self.checkout_path, '.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'], ['config', '--local', '--get-regexp', r'remote.*.url'],
cwd=self.checkout_path))[1] cwd=self.checkout_path))[1]
...@@ -171,7 +171,7 @@ class SCMWrapper(object): ...@@ -171,7 +171,7 @@ class SCMWrapper(object):
mirror = git_cache.Mirror(url) mirror = git_cache.Mirror(url)
if (mirror.exists() and mirror.mirror_path.replace('\\', '/') == if (mirror.exists() and mirror.mirror_path.replace('\\', '/') ==
actual_remote_url.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'], ['config', '--local', '--get-regexp', r'remote.*.url'],
cwd=mirror.mirror_path))[1] cwd=mirror.mirror_path))[1]
return actual_remote_url return actual_remote_url
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment