merge with mainline
authorBenoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 27 Sep 2006 09:35:53 +0200
changeset 3164 706277866251
parent 3160 36ab673f66a5 (diff)
parent 3163 a9e75b371315 (current diff)
child 3165 5c93dd0ae413
merge with mainline
--- a/mercurial/httprepo.py
+++ b/mercurial/httprepo.py
@@ -165,7 +165,8 @@ class httprepository(remoterepository):
                                                proxyuser, proxypasswd or ''),
                     proxypath, proxyquery, proxyfrag))
                 handler = urllib2.ProxyHandler({scheme: proxyurl})
-                ui.debug(_('proxying through %s\n') % proxyurl)
+                ui.debug(_('proxying through http://%s:%s\n') % 
+                          (proxyhost, proxyport))
 
         # urllib2 takes proxy values from the environment and those
         # will take precedence if found, so drop them