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