Mercurial > hg
view tests/test-rebase-cache @ 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 | bae9bb09166b |
children | b345b1cc124f |
line wrap: on
line source
#!/bin/sh createrepo() { rm -rf repo hg init repo cd repo echo "a" > a hg commit -d '0 0' -A -m 'A' hg branch branch1 hg commit -d '1 0' -m 'Branch1' echo "b" > b hg commit -A -d '2 0' -m 'B' hg up 0 hg branch branch2 hg commit -d '3 0' -m 'Branch2' echo "c" > C hg commit -A -d '4 0' -m 'C' hg up 2 hg branch -f branch2 echo "d" > d hg commit -A -d '5 0' -m 'D' echo "e" > e hg commit -A -d '6 0' -m 'E' hg update default hg branch branch3 hg commit -d '7 0' -m 'Branch3' echo "f" > f hg commit -A -d '8 0' -m 'F' } echo createrepo > /dev/null 2>&1 hg --config extensions.hgext.graphlog= glog --template '{rev}:{node|short} {desc} branch: {branches}\n' echo echo '% Branches' hg branches echo echo '% Heads' hg heads --template '{rev}:{node|short} {desc} branch: {branches}\n' echo echo '% Rebase part of branch2 (5-6) onto branch3 (8)' hg --config extensions.hgext.rebase= rebase --detach -s 5 -d 8 2>&1 | sed 's/\(saving bundle to \).*/\1/' echo echo '% Branches' hg branches echo echo '% Heads' hg heads --template '{rev}:{node|short} {desc} branch: {branches}\n' echo hg --config extensions.hgext.graphlog= glog --template '{rev}:{node|short} {desc} branch: {branches}\n' echo echo '% Rebase head of branch3 (8) onto branch2 (6)' createrepo > /dev/null 2>&1 hg --config extensions.hgext.graphlog= glog --template '{rev}:{node|short} {desc} branch: {branches}\n' hg --config extensions.hgext.rebase= rebase --detach -s 8 -d 6 2>&1 | sed 's/\(saving bundle to \).*/\1/' echo echo '% Branches' hg branches echo echo '% Heads' hg heads --template '{rev}:{node|short} {desc} branch: {branches}\n' echo hg --config extensions.hgext.graphlog= glog --template '{rev}:{node|short} {desc} branch: {branches}\n' hg verify -q echo echo '% Rebase entire branch3 (7-8) onto branch2 (6)' createrepo > /dev/null 2>&1 hg --config extensions.hgext.graphlog= glog --template '{rev}:{node|short} {desc} branch: {branches}\n' hg --config extensions.hgext.rebase= rebase --detach -s 7 -d 6 2>&1 | sed 's/\(saving bundle to \).*/\1/' echo echo '% Branches' hg branches echo echo '% Heads' hg heads --template '{rev}:{node|short} {desc} branch: {branches}\n' echo hg --config extensions.hgext.graphlog= glog --template '{rev}:{node|short} {desc} branch: {branches}\n' hg verify -q