changeset 3171:706277866251

merge with mainline
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 27 Sep 2006 09:35:53 +0200
parents 36ab673f66a5 (diff) a9e75b371315 (current diff)
children 5c93dd0ae413
files
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/httprepo.py	Tue Sep 26 16:21:52 2006 -0500
+++ b/mercurial/httprepo.py	Wed Sep 27 09:35:53 2006 +0200
@@ -165,7 +165,8 @@
                                                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