Mercurial > public > mercurial-scm > hg
view tests/test-mq-qclone-http @ 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 | 662b0f9eb148 |
children |
line wrap: on
line source
#! /bin/sh echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH mkdir webdir cd webdir hg init a hg --cwd a qinit -c echo a > a/a hg --cwd a ci -A -m a echo b > a/b hg --cwd a addremove hg --cwd a qnew -f b.patch hg --cwd a qcommit -m b.patch hg --cwd a log --template "{desc}\n" hg --cwd a/.hg/patches log --template "{desc}\n" root=`pwd` cd .. echo % test with recursive collection cat > collections.conf <<EOF [paths] /=$root/** EOF hg serve -p $HGPORT -d --pid-file=hg.pid --webdir-conf collections.conf \ -A access-paths.log -E error-paths-1.log cat hg.pid >> $DAEMON_PIDS "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/?style=raw' hg qclone http://localhost:$HGPORT/a b hg --cwd b log --template "{desc}\n" hg --cwd b qpush -a hg --cwd b log --template "{desc}\n" echo % test with normal collection cat > collections1.conf <<EOF [paths] /=$root/* EOF hg serve -p $HGPORT1 -d --pid-file=hg.pid --webdir-conf collections1.conf \ -A access-paths.log -E error-paths-1.log cat hg.pid >> $DAEMON_PIDS "$TESTDIR/get-with-headers.py" localhost:$HGPORT1 '/?style=raw' hg qclone http://localhost:$HGPORT1/a c hg --cwd c log --template "{desc}\n" hg --cwd c qpush -a hg --cwd c log --template "{desc}\n" echo % test with old-style collection cat > collections2.conf <<EOF [collections] $root=$root EOF hg serve -p $HGPORT2 -d --pid-file=hg.pid --webdir-conf collections2.conf \ -A access-paths.log -E error-paths-1.log cat hg.pid >> $DAEMON_PIDS "$TESTDIR/get-with-headers.py" localhost:$HGPORT2 '/?style=raw' hg qclone http://localhost:$HGPORT2/a d hg --cwd d log --template "{desc}\n" hg --cwd d qpush -a hg --cwd d log --template "{desc}\n" echo '% test --mq works and uses correct repository config' hg --cwd d outgoing --mq | sed "s|$HGPORT2|\$HGPORT2|" hg --cwd d log --mq --template '{rev} {desc|firstline}\n'