activepath: remove unneeded, confusing compatibility hack

This commit is contained in:
Ryan McElroy 2015-05-28 19:32:52 -07:00
parent 94511b0683
commit 3dbe2dd5e1

View File

@ -837,12 +837,9 @@ def activepath(ui, remote):
else: else:
if uri.startswith('http'): if uri.startswith('http'):
try: try:
uri = url.url(uri).authinfo()[0] uri = util.url(uri).authinfo()[0]
except AttributeError: except AttributeError:
try: uri = url.getauthinfo(uri)[0]
uri = util.url(uri).authinfo()[0]
except AttributeError:
uri = url.getauthinfo(uri)[0]
uri = uri.rstrip('/') uri = uri.rstrip('/')
# guard against hgsubversion nonsense # guard against hgsubversion nonsense
if not isinstance(rpath, basestring): if not isinstance(rpath, basestring):