Mercurial > hg
changeset 8055:027ac8ccfb5b
Merge with crew-stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Mon, 13 Apr 2009 14:36:55 +0200 |
| parents | fe2a87a3d344 (current diff) b13cc762314a (diff) |
| children | f614f11a96ca |
| files | mercurial/httprepo.py |
| diffstat | 1 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/httprepo.py Sat Apr 11 23:43:24 2009 +0200 +++ b/mercurial/httprepo.py Mon Apr 13 14:36:55 2009 +0200 @@ -99,13 +99,14 @@ except AttributeError: proto = resp.headers['content-type'] + safeurl = url.hidepassword(self._url) # accept old "text/plain" and "application/hg-changegroup" for now if not (proto.startswith('application/mercurial-') or proto.startswith('text/plain') or proto.startswith('application/hg-changegroup')): - self.ui.debug(_("requested URL: '%s'\n") % cu) + self.ui.debug(_("requested URL: '%s'\n") % url.hidepassword(cu)) raise error.RepoError(_("'%s' does not appear to be an hg repository") - % self._url) + % safeurl) if proto.startswith('application/mercurial-'): try: @@ -113,10 +114,10 @@ version_info = tuple([int(n) for n in version.split('.')]) except ValueError: raise error.RepoError(_("'%s' sent a broken Content-Type " - "header (%s)") % (self._url, proto)) + "header (%s)") % (safeurl, proto)) if version_info > (0, 1): raise error.RepoError(_("'%s' uses newer protocol %s") % - (self._url, version)) + (safeurl, version)) return resp