comparison tests/test-subrepo-relative-path @ 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
children
comparison
equal deleted inserted replaced
11108:8d0cdeaa12f3 11109:a2bc2f2d77a9
1 #!/bin/sh
2
3 echo % Preparing the subrepository 'sub'
4 hg init sub
5 echo sub > sub/sub
6 hg add -R sub
7 hg commit -R sub -m "sub import"
8
9 echo % Preparing the 'main' repo which depends on the subrepo 'sub'
10 hg init main
11 echo main > main/main
12 echo "sub = ../sub" > main/.hgsub
13 hg clone sub main/sub | sed 's/ .*sub/ ...sub/g'
14 hg add -R main
15 hg commit -R main -m "main import"
16
17 echo % Cleaning both repositories, just as a clone -U
18 hg up -C -R sub null
19 hg up -C -R main null
20 rm -rf main/sub
21
22 echo % Serving them both using hgweb
23 printf '[paths]\n/main = main\nsub = sub\n' > webdir.conf
24 hg serve --webdir-conf webdir.conf -a localhost -p $HGPORT \
25 -A /dev/null -E /dev/null --pid-file hg.pid -d
26 cat hg.pid >> $DAEMON_PIDS
27
28 echo % Clone main from hgweb
29 hg clone "http://localhost:$HGPORT/main" cloned | sed 's/ .*sub/ ...sub/g'
30
31 echo % Checking cloned repo ids
32 hg id -R cloned
33 hg id -R cloned/sub
34
35 echo % subrepo debug for 'main' clone
36 hg debugsub -R cloned
37
38 "$TESTDIR/killdaemons.py"
39
40 exit 0