annotate tests/test-convert-bzr-114 @ 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

#!/bin/sh

"$TESTDIR/hghave" bzr114 || exit 80

. "$TESTDIR/bzr-definitions"

# The file/directory replacement can only be reproduced on
# bzr >= 1.4. Merge it back in test-convert-bzr-directories once
# this version becomes mainstream.
echo % replace file with dir
mkdir test-replace-file-with-dir
cd test-replace-file-with-dir
bzr init -q source
cd source
echo d > d
bzr add -q d
bzr commit -q -m 'add d file'
rm d
mkdir d
bzr add -q d
bzr commit -q -m 'replace with d dir'
echo a > d/a
bzr add -q d/a
bzr commit -q -m 'add d/a'
cd ..
hg convert source source-hg
manifest source-hg tip
cd source-hg
hg update
cd ../..