Changeset 88a2b9aac638…
Parent 29c30e4c23b5…
by
Changes to 2 files · Browse files at 88a2b9aac638 Showing diff from parent 29c30e4c23b5 Diff from another changeset...
@@ -630,7 +630,7 @@ cmdline.append('--insecure')
if user:
cleanurl = hglib.removeauth(cururl)
- res = url.readauthforuri(self.repo.ui, cleanurl)
+ res = hglib.readauthforuri(self.repo.ui, cleanurl)
if res:
group, auth = res
if auth.get('username'):
@@ -1122,7 +1122,7 @@
# if the already user has an [auth] configuration for this URL, use it
cleanurl = hglib.removeauth(origurl)
- res = url.readauthforuri(repo.ui, cleanurl)
+ res = hglib.readauthforuri(repo.ui, cleanurl)
if res:
self.alias, auth = res
else:
|
@@ -35,6 +35,12 @@ except ImportError:
# hg <= 1.8
from mercurial.url import hidepassword, removeauth
+try:
+ # hg >= 1.9
+ from mercurial.httpconnection import readauthforuri
+except ImportError:
+ # hg <= 1.8
+ from mercurial.url import readauthforuri
demandimport.enable()
def revsetmatch(ui, pattern):
|
Loading...