Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/httprepo.py @ 5477:f00ed7c5877b
Merge with crew-stable
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Thu, 25 Oct 2007 00:09:13 +0200 |
parents | b3afa6725082 |
children |
line wrap: on
line diff
--- a/mercurial/httprepo.py +++ b/mercurial/httprepo.py @@ -230,6 +230,9 @@ class httprepository(remoterepository): # "http_proxy.always" config is for running tests on localhost if (not ui.configbool("http_proxy", "always") and host.lower() in no_list): + # avoid auto-detection of proxy settings by appending + # a ProxyHandler with no proxies defined. + handlers.append(urllib2.ProxyHandler({})) ui.debug(_('disabling proxy for %s\n') % host) else: proxyurl = urlparse.urlunsplit((