Mercurial > hg
view tests/test-convert-splicemap @ 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 | bb5ea66789e3 |
children |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "convert=" >> $HGRCPATH echo 'graphlog =' >> $HGRCPATH glog() { hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@" } hg init repo1 cd repo1 echo a > a hg ci -Am adda echo b > b echo a >> a hg ci -Am addb PARENTID1=`hg id --debug -i` echo c > c hg ci -Am addc PARENTID2=`hg id --debug -i` cd .. hg init repo2 cd repo2 echo b > a echo d > d hg ci -Am addaandd CHILDID1=`hg id --debug -i` echo d >> d hg ci -Am changed CHILDID2=`hg id --debug -i` echo e > e hg ci -Am adde cd .. echo '% test invalid splicemap' cat > splicemap <<EOF $CHILDID2 EOF hg convert --splicemap splicemap repo2 repo1 echo '% splice repo2 on repo1' cat > splicemap <<EOF $CHILDID1 $PARENTID1 $CHILDID2 $PARENTID2,$CHILDID1 EOF hg clone repo1 target1 hg convert --splicemap splicemap repo2 target1 glog -R target1