Mercurial > hg
view tests/test-pull-branch @ 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 | e17dbf140035 |
children |
line wrap: on
line source
#!/bin/sh hg init t cd t echo 1 > foo hg ci -Am1 # 0 hg branch branchA echo a1 > foo hg ci -ma1 # 1 cd .. hg init tt cd tt hg pull ../t hg up branchA cd ../t echo a2 > foo hg ci -ma2 # 2 echo % create branch B hg up 0 hg branch branchB echo b1 > foo hg ci -mb1 # 3 cd ../tt echo % a new branch is there hg pull -u ../t echo % develop both branch cd ../t hg up branchA echo a3 > foo hg ci -ma3 # 4 hg up branchB echo b2 > foo hg ci -mb2 # 5 cd ../tt echo % should succeed, no new heads hg pull -u ../t echo % add an head on other branch cd ../t hg up branchA echo a4 > foo hg ci -ma4 # 6 hg up branchB echo b3.1 > foo hg ci -m b3.1 # 7 hg up 5 echo b3.2 > foo hg ci -m b3.2 # 8 cd ../tt echo % should succeed only one head on our branch hg pull -u ../t cd ../t hg up -C branchA echo a5.1 > foo hg ci -ma5.1 # 9 hg up 6 echo a5.2 > foo hg ci -ma5.2 # 10 hg up 7 echo b4.1 > foo hg ci -m b4.1 # 11 hg up -C 8 echo b4.2 > foo hg ci -m b4.2 # 12 cd ../tt echo % should fail new head in our branch hg pull -u ../t