Mercurial > hg
view tests/test-newbranch @ 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 | e67e5b60e55f |
children | 4c94b6d0fb1c |
line wrap: on
line source
#!/bin/sh branchcache=.hg/branchheads.cache hg init t cd t hg branches echo foo > a hg add a hg ci -m "initial" -d "1000000 0" hg branch foo hg branch hg ci -m "add branch name" -d "1000000 0" hg branch bar hg ci -m "change branch name" -d "1000000 0" echo % branch shadowing hg branch default hg branch -f default hg ci -m "clear branch name" -d "1000000 0" echo % there should be only one default branch head hg heads . hg co foo hg branch echo bleah > a hg ci -m "modify a branch" -d "1000000 0" hg merge default hg branch hg ci -m "merge" -d "1000000 0" hg log hg branches hg branches -q echo % test for invalid branch cache hg rollback cp $branchcache .hg/bc-invalid hg log -r foo cp .hg/bc-invalid $branchcache hg --debug log -r foo rm $branchcache echo corrupted > $branchcache hg log -qr foo cat $branchcache echo % push should update the branch cache hg init ../target echo % pushing just rev 0 hg push -qr 0 ../target cat ../target/$branchcache echo % pushing everything hg push -qf ../target cat ../target/$branchcache echo % update with no arguments: tipmost revision of the current branch hg up -q -C 0 hg up -q hg id hg up -q 1 hg up -q hg id hg branch foobar hg up echo % fastforward merge hg branch ff echo ff > ff hg ci -Am'fast forward' -d '1000000 0' hg up foo hg merge ff hg branch hg commit -m'Merge ff into foo' -d '1000000 0' hg parents hg manifest echo % test merging, add 3 default heads and one test head cd .. hg init merges cd merges echo a > a hg ci -Ama echo b > b hg ci -Amb hg up 0 echo c > c hg ci -Amc hg up 0 echo d > d hg ci -Amd hg up 0 hg branch test echo e >> e hg ci -Ame hg log echo % implicit merge with test branch as parent hg merge hg up -C default echo % implicit merge with default branch as parent hg merge echo % 3 branch heads, explicit merge required hg merge 2 hg ci -m merge echo % 2 branch heads, implicit merge works hg merge