Mercurial > hg
comparison mercurial/url.py @ 8344:873429914ec5
url: fix bug in passwordmgr related to auth configuration
Usernames given as part of the URL would be ignored.
This bug was introduced in 89c80c3dc5842d609e9ba13f08fd2cf7f127c25a
| author | Sune Foldager <cryo@cyanite.org> |
|---|---|
| date | Mon, 11 May 2009 07:55:13 +0200 |
| parents | 89c80c3dc584 |
| children | 59acb9c7d90f |
comparison
equal
deleted
inserted
replaced
| 8343:6fbbb90261b1 | 8344:873429914ec5 |
|---|---|
| 106 user, passwd = authinfo | 106 user, passwd = authinfo |
| 107 if user and passwd: | 107 if user and passwd: |
| 108 self._writedebug(user, passwd) | 108 self._writedebug(user, passwd) |
| 109 return (user, passwd) | 109 return (user, passwd) |
| 110 | 110 |
| 111 user, passwd = self._readauthtoken(authuri) | 111 if not user: |
| 112 user, passwd = self._readauthtoken(authuri) | |
| 112 if not user or not passwd: | 113 if not user or not passwd: |
| 113 if not self.ui.interactive(): | 114 if not self.ui.interactive(): |
| 114 raise util.Abort(_('http authorization required')) | 115 raise util.Abort(_('http authorization required')) |
| 115 | 116 |
| 116 self.ui.write(_("http authorization required\n")) | 117 self.ui.write(_("http authorization required\n")) |