提交 e7431fd8 编写于 作者: J Jannis Leidel

Fixed handling of Bazaar's bzr+ssh scheme.

上级 d99c2b46
......@@ -3316,10 +3316,6 @@ class Bazaar(VersionControl):
if branch:
logger.notify('Checking out %s%s to %s'
% (url, rev_display, display_path(dest)))
# FIXME: find a better place to hotfix the URL scheme
# after removing bzr+ from bzr+ssh:// readd it
if url.startswith('ssh://'):
url = 'bzr+' + url
if update:
call_subprocess(
[BZR_CMD, 'pull', '-q'] + rev_options + [url], cwd=dest)
......@@ -3327,6 +3323,13 @@ class Bazaar(VersionControl):
call_subprocess(
[BZR_CMD, 'branch', '-q'] + rev_options + [url, dest])
def get_url_rev(self):
# hotfix the URL scheme after removing bzr+ from bzr+ssh:// readd it
url, rev = super(Bazaar, self).get_url_rev()
if url.startswith('ssh://'):
url = 'bzr+' + url
return url, rev
def get_url(self, location):
urls = call_subprocess(
[BZR_CMD, 'info'], show_stdout=False, cwd=location)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册