mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +03:00
merge with backout
This commit is contained in:
commit
1f5f22d2a8
@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
|
||||
{ hg clone http://localhost:$HGPORT/ copy 2>&1; echo $?; } | \
|
||||
sed 's/error:.*/error:/'
|
||||
hg clone http://localhost:$HGPORT/ copy
|
||||
echo $?
|
||||
test -d copy || echo copy: No such file or directory
|
||||
|
||||
cat > dumb.py <<EOF
|
||||
@ -23,7 +23,8 @@ echo $! >> $DAEMON_PIDS
|
||||
# give the server some time to start running
|
||||
sleep 1
|
||||
|
||||
{ http_proxy= hg clone http://localhost:$HGPORT/foo copy2 2>&1; echo $?; } | \
|
||||
http_proxy= hg clone http://localhost:$HGPORT/foo copy2 2>&1 | \
|
||||
sed -e 's/404.*/404/' -e 's/Date:.*/Date:/'
|
||||
echo $?
|
||||
|
||||
kill $!
|
||||
|
@ -1,5 +1,5 @@
|
||||
abort: error:
|
||||
abort: error: Connection refused
|
||||
255
|
||||
copy: No such file or directory
|
||||
abort: HTTP Error 404
|
||||
255
|
||||
0
|
||||
|
@ -36,8 +36,7 @@ echo %% url with user name and password
|
||||
http_proxy=http://user:passwd@localhost:$HGPORT1 hg clone --config http_proxy.always=True http://user:passwd@localhost:$HGPORT/ e
|
||||
|
||||
echo %% bad host:port for proxy
|
||||
http_proxy=localhost:$HGPORT2 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ f 2>&1 | \
|
||||
sed 's/error:.*/error:/'
|
||||
http_proxy=localhost:$HGPORT2 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ f
|
||||
|
||||
echo %% do not use the proxy if it is in the no list
|
||||
http_proxy=localhost:$HGPORT1 hg clone --config http_proxy.no=localhost http://localhost:$HGPORT/ g
|
||||
|
@ -48,7 +48,7 @@ added 1 changesets with 1 changes to 1 files
|
||||
updating working directory
|
||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
||||
%% bad host:port for proxy
|
||||
abort: error:
|
||||
abort: error: Connection refused
|
||||
%% do not use the proxy if it is in the no list
|
||||
requesting all changes
|
||||
adding changesets
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
cp "$TESTDIR"/printenv.py .
|
||||
|
||||
{ http_proxy= hg clone http://localhost:$HGPORT/ copy 2>&1; echo $?; } | \
|
||||
sed 's/error:.*/error:/'
|
||||
http_proxy= hg clone http://localhost:$HGPORT/ copy
|
||||
echo $?
|
||||
test -d copy || echo copy: No such file or directory
|
||||
|
||||
# This server doesn't do range requests so it's basically only good for
|
||||
|
@ -1,4 +1,4 @@
|
||||
abort: error:
|
||||
abort: error: Connection refused
|
||||
255
|
||||
copy: No such file or directory
|
||||
changeset: 0:53e17d176ae6
|
||||
|
Loading…
Reference in New Issue
Block a user