Mercurial > hg
view tests/test-http @ 11109:a2bc2f2d77a9
subrepo: normalize path part of URLs so that pulling subrepos from webdir works
For a "all projects at root" repo layout eg:
/main
/sub
Where subrepos are used such that a clone of main has this layout:
./main/
./main/.hgsub
./main/sub/
And the .hgsub content is:
sub = ../sub
This allows a pull from a hgweb where main and sub are exposed
at the root (or same directory level)
The current code doesn't normalize the path component of a pull
url. this results in trying to pull from
http://server.com/hg/main/../sub
Current hgweb implementation doesn't reduce the path component
so this results in a 404 error though everything is setup logically.
This patch adresses this 404 error on the puller side
normalizing the URLs used for pulling sub repos. For this
example, the URL would be reduced to http://server.com/hg/sub
Fix + test
author | Edouard Gomez <ed.gomez@free.fr> |
---|---|
date | Sat, 01 May 2010 23:05:19 +0200 |
parents | 1a8df80dfdde |
children |
line wrap: on
line source
#!/bin/sh cp "$TESTDIR"/printenv.py . hg init test cd test echo foo>foo mkdir foo.d foo.d/bAr.hg.d foo.d/baR.d.hg echo foo>foo.d/foo echo bar>foo.d/bAr.hg.d/BaR echo bar>foo.d/baR.d.hg/bAR hg commit -A -m 1 hg serve -p $HGPORT -d --pid-file=../hg1.pid hg --config server.uncompressed=False serve -p $HGPORT1 -d --pid-file=../hg2.pid # Test server address cannot be reused hg serve -p $HGPORT1 2>&1 | sed -e "s/abort: cannot start server at ':$HGPORT1':.*/abort: cannot start server at ':\$HGPORT1':/" cd .. cat hg1.pid hg2.pid >> $DAEMON_PIDS echo % clone via stream hg clone --uncompressed http://localhost:$HGPORT/ copy 2>&1 | \ sed -e 's/[0-9][0-9.]*/XXX/g' -e 's/[KM]\(B\/sec\)/X\1/' hg verify -R copy echo % try to clone via stream, should use pull instead hg clone --uncompressed http://localhost:$HGPORT1/ copy2 echo % clone via pull hg clone http://localhost:$HGPORT1/ copy-pull hg verify -R copy-pull cd test echo bar > bar hg commit -A -d '1 0' -m 2 cd .. echo % pull cd copy-pull echo '[hooks]' >> .hg/hgrc echo 'changegroup = python ../printenv.py changegroup' >> .hg/hgrc hg pull | sed -e "s,:$HGPORT1/,:\$HGPORT1/," cd ..