Mercurial > public > mercurial-scm > hg
view tests/test-mq-header-date @ 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 | 8cb81d75730c |
children |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH echo "[diff]" >> $HGRCPATH echo "nodates=true" >> $HGRCPATH catpatch() { cat .hg/patches/$1.patch | sed -e "s/^diff \-r [0-9a-f]* /diff -r ... /" \ -e "s/^\(# Parent \).*/\1/" } catlog() { catpatch $1 hg log --template "{rev}: {desc} - {author}\n" } catlogd() { catpatch $1 hg log --template "{rev}: {desc} - {author} - {date}\n" } drop() { hg qpop hg qdel $1.patch } runtest() { echo ==== init hg init a cd a hg qinit echo ==== qnew -d hg qnew -d '3 0' 1.patch catlogd 1 echo ==== qref echo "1" >1 hg add hg qref catlogd 1 echo ==== qref -d hg qref -d '4 0' catlogd 1 echo ==== qnew hg qnew 2.patch echo "2" >2 hg add hg qref catlog 2 echo ==== qref -d hg qref -d '5 0' catlog 2 drop 2 echo ==== qnew -d -m hg qnew -d '6 0' -m "Three" 3.patch catlogd 3 echo ==== qref echo "3" >3 hg add hg qref catlogd 3 echo ==== qref -m hg qref -m "Drei" catlogd 3 echo ==== qref -d hg qref -d '7 0' catlogd 3 echo ==== qref -d -m hg qref -d '8 0' -m "Three (again)" catlogd 3 echo ==== qnew -m hg qnew -m "Four" 4.patch echo "4" >4 hg add hg qref catlog 4 echo ==== qref -d hg qref -d '9 0' catlog 4 drop 4 echo ==== qnew with HG header hg qnew --config 'mq.plain=true' 5.patch hg qpop echo "# HG changeset patch" >>.hg/patches/5.patch echo "# Date 10 0" >>.hg/patches/5.patch hg qpush 2>&1 | grep 'Now at' catlogd 5 echo ==== hg qref echo "5" >5 hg add hg qref catlogd 5 echo ==== hg qref -d hg qref -d '11 0' catlogd 5 echo ==== qnew with plain header hg qnew --config 'mq.plain=true' -d '12 0' 6.patch hg qpop hg qpush 2>&1 | grep 'now at' catlog 6 echo ==== hg qref echo "6" >6 hg add hg qref catlogd 6 echo ==== hg qref -d hg qref -d '13 0' catlogd 6 drop 6 echo ==== qnew -u hg qnew -u jane 6.patch echo "6" >6 hg add hg qref catlog 6 echo ==== qref -d hg qref -d '12 0' catlog 6 drop 6 echo ==== qnew -d hg qnew -d '13 0' 7.patch echo "7" >7 hg add hg qref catlog 7 echo ==== qref -u hg qref -u john catlogd 7 echo ==== qnew hg qnew 8.patch echo "8" >8 hg add hg qref catlog 8 echo ==== qref -u -d hg qref -u john -d '14 0' catlog 8 drop 8 echo ==== qnew -m hg qnew -m "Nine" 9.patch echo "9" >9 hg add hg qref catlog 9 echo ==== qref -u -d hg qref -u john -d '15 0' catlog 9 drop 9 echo ==== "qpop -a / qpush -a" hg qpop -a hg qpush -a hg log --template "{rev}: {desc} - {author} - {date}\n" } echo ======= plain headers echo "[mq]" >> $HGRCPATH echo "plain=true" >> $HGRCPATH mkdir sandbox (cd sandbox ; runtest) rm -r sandbox echo ======= hg headers echo "plain=false" >> $HGRCPATH mkdir sandbox (cd sandbox ; runtest) rm -r sandbox