annotate tests/test-586 @ 8590:59acb9c7d90f

url: use CONNECT for HTTPS connections through HTTP proxy (issue967)

urllib2 and httplib does not support using CONNECT proxy requests, but
only regular requests over the proxy. This does not work with HTTPS
requests as they typically require that the client issues a CONNECT to
the proxy to give a direct connection to the remote HTTPS server.

This is solved by duplicating some of the httplib functionality and
tying it together with the keepalive library such that a HTTPS
connection that need to be proxied can be proxied by letting a
connection be established to the proxy server and then subsequently
performing the normal request to the specified server through the
proxy server.

As it stands, the code also purports to support HTTPS proxies, i.e.
proxies that you connect to using SSL. These are extremely rare and
nothing is done to ensure that CONNECT requests can be made to these
as that would require multiple SSL handshakes. This use case is also
not supported by most other contemporary web tools like curl and
Firefox3.

#!/bin/sh
# a test for issue586

hg init a
cd a
echo a > a
hg ci -Ama

hg init ../b
cd ../b
echo b > b
hg ci -Amb

hg pull -f ../a
hg merge
hg rm -f a
hg ci -Amc

hg st -A
cd ..

# a test for issue 1433, related to issue586
echo % create test repos
hg init repoa
touch repoa/a
hg -R repoa ci -Am adda

hg init repob
touch repob/b
hg -R repob ci -Am addb

hg init repoc
cd repoc
hg pull ../repoa
hg update
mkdir tst
hg mv * tst
hg ci -m "import a in tst"
hg pull -f ../repob
echo % merge both repos
hg merge
mkdir src
echo % move b content
hg mv b src
hg ci -m "import b in src"
hg manifest