Mercurial > hg
view tests/test-mq-pull-from-bundle @ 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 | bc784304fea1 |
children |
line wrap: on
line source
#!/bin/sh cat <<EOF >> $HGRCPATH [extensions] mq= [defaults] log = --template "{rev}: {desc}\\n" heads = --template "{rev}: {desc}\\n" incoming = --template "{rev}: {desc}\\n" EOF echo "====== Setup main" hg init base cd base echo "One" > one hg add hg ci -m "main: one added." echo "++" >> one hg ci -m "main: one updated." echo "====== Bundle main" hg bundle --base=null ../main.hg cd .. echo "====== Incoming to fresh repo" hg init fresh echo ">> hg -R fresh incoming main.hg" hg -R fresh incoming main.hg echo ">> hg -R fresh incoming bundle:fresh+main.hg" hg -R fresh incoming bundle:fresh+main.hg echo "====== Setup queue" cd base hg qinit -c hg qnew -m "patch: two added." two.patch echo two > two hg add hg qrefresh hg qcommit -m "queue: two.patch added." hg qpop -a echo "====== Bundle queue" hg -R .hg/patches bundle --base=null ../queue.hgq cd .. echo "====== Clone base" hg clone base copy cd copy hg qinit -c echo "====== Incoming queue bundle" echo ">> hg -R .hg/patches incoming ../queue.hgq" hg -R .hg/patches incoming ../queue.hgq echo "====== Pull queue bundle" echo ">> hg -R .hg/patches pull --update ../queue.hgq" hg -R .hg/patches pull --update ../queue.hgq echo ">> hg -R .hg/patches heads" hg -R .hg/patches heads echo ">> hg -R .hg/patches log" hg -R .hg/patches log echo ">> hg qseries" hg qseries cd .. echo "====== Clone base again" hg clone base copy2 cd copy2 hg qinit -c echo "====== Unbundle queue bundle" echo ">> hg -R .hg/patches unbundle --update ../queue.hgq" hg -R .hg/patches unbundle --update ../queue.hgq echo ">> hg -R .hg/patches heads" hg -R .hg/patches heads echo ">> hg -R .hg/patches log" hg -R .hg/patches log echo ">> hg qseries" hg qseries cd ..