Show More
@@ -110,7 +110,7 b' class HTTPPasswordHandler(object):' | |||||
110 | self.last_reply = dict(realm=realm,authuri=authuri,user=user) |
|
110 | self.last_reply = dict(realm=realm,authuri=authuri,user=user) | |
111 | return user, pwd |
|
111 | return user, pwd | |
112 |
|
112 | |||
113 | # Loading username and maybe password from [auth] in .hg/hgrc |
|
113 | # Loading username and maybe password and prefix URL from [auth] in .hg/hgrc | |
114 | nuser, pwd, prefix_url = self.load_hgrc_auth(ui, base_url) |
|
114 | nuser, pwd, prefix_url = self.load_hgrc_auth(ui, base_url) | |
115 | if prefix_url: |
|
115 | if prefix_url: | |
116 | keyring_url = prefix_url |
|
116 | keyring_url = prefix_url | |
@@ -210,13 +210,11 b' class HTTPPasswordHandler(object):' | |||||
210 | local_ui.readconfig(os.path.join(repo_root, ".hg", "hgrc")) |
|
210 | local_ui.readconfig(os.path.join(repo_root, ".hg", "hgrc")) | |
211 | local_passwordmgr = passwordmgr(local_ui) |
|
211 | local_passwordmgr = passwordmgr(local_ui) | |
212 | auth_token = local_passwordmgr.readauthtoken(base_url) |
|
212 | auth_token = local_passwordmgr.readauthtoken(base_url) | |
213 | local_ui.debug("auth token: " + repr(auth_token) + "\n") |
|
|||
214 | if auth_token: |
|
213 | if auth_token: | |
215 | username = auth_token.get('username') |
|
214 | username = auth_token.get('username') | |
216 | password = auth_token.get('password') |
|
215 | password = auth_token.get('password') | |
217 | prefix = auth_token.get('prefix') |
|
216 | prefix = auth_token.get('prefix') | |
218 | shortest_url = self.shortest_url(base_url, prefix) |
|
217 | shortest_url = self.shortest_url(base_url, prefix) | |
219 | local_ui.debug("shortest URL: " + shortest_url + "\n") |
|
|||
220 | return username, password, shortest_url |
|
218 | return username, password, shortest_url | |
221 |
|
219 | |||
222 | return None, None |
|
220 | return None, None |
General Comments 0
You need to be logged in to leave comments.
Login now