comparison mercurial/hg.py @ 426:8c90ab5644c9

Allow hgrc's proxy host and $http_proxy env var to start with http:// -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Allow hgrc's proxy host and $http_proxy env var to start with http:// manifest hash: 5bf4bb43606f3e5544d55be886502ab5a61f9ff3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCtcR6W7P1GVgWeRoRArk0AKCgHpelPjAKjbzh3iifZayAhovm+gCeL0hl XU7LBUrK2Z2qQHN0w9I8XUk= =QaAW -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 19 Jun 2005 20:16:10 +0100
parents 9294dce4b633
children 688d03d6997a
comparison
equal deleted inserted replaced
425:719663b7f235 426:8c90ab5644c9
1331 self.ui = ui 1331 self.ui = ui
1332 no_list = [ "localhost", "127.0.0.1" ] 1332 no_list = [ "localhost", "127.0.0.1" ]
1333 host = ui.config("http_proxy", "host") 1333 host = ui.config("http_proxy", "host")
1334 if host is None: 1334 if host is None:
1335 host = os.environ.get("http_proxy") 1335 host = os.environ.get("http_proxy")
1336 if host and host.startswith('http://'):
1337 host = host[7:]
1336 user = ui.config("http_proxy", "user") 1338 user = ui.config("http_proxy", "user")
1337 passwd = ui.config("http_proxy", "passwd") 1339 passwd = ui.config("http_proxy", "passwd")
1338 no = ui.config("http_proxy", "no") 1340 no = ui.config("http_proxy", "no")
1339 if no is None: 1341 if no is None:
1340 no = os.environ.get("no_proxy") 1342 no = os.environ.get("no_proxy")