# HG changeset patch # User Thomas Arendsen Hein # Date 1119208570 -3600 # Node ID 8c90ab5644c9cd9ddd217600e76dc508b0eeb0fb # Parent 719663b7f235d6810ac180d802d541502d8f153f 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----- diff -r 719663b7f235 -r 8c90ab5644c9 mercurial/hg.py --- a/mercurial/hg.py Sun Jun 19 14:21:38 2005 +0100 +++ b/mercurial/hg.py Sun Jun 19 20:16:10 2005 +0100 @@ -1333,6 +1333,8 @@ host = ui.config("http_proxy", "host") if host is None: host = os.environ.get("http_proxy") + if host and host.startswith('http://'): + host = host[7:] user = ui.config("http_proxy", "user") passwd = ui.config("http_proxy", "passwd") no = ui.config("http_proxy", "no")