Mercurial > hg
view tests/test-convert-tagsbranch-topology @ 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 | d1b135f2f415 |
children |
line wrap: on
line source
#!/bin/sh "$TESTDIR/hghave" git || exit 80 echo "[extensions]" >> $HGRCPATH echo "convert=" >> $HGRCPATH echo 'hgext.graphlog =' >> $HGRCPATH echo '[convert]' >> $HGRCPATH echo 'hg.usebranchnames = True' >> $HGRCPATH echo 'hg.tagsbranch = tags-update' >> $HGRCPATH GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0000"; export GIT_AUTHOR_DATE GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE count=10 action() { GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000" GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE" git "$@" >/dev/null 2>/dev/null || echo "git command error" count=`expr $count + 1` } glog() { hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@" } convertrepo() { hg convert --datesort git-repo hg-repo } # Build a GIT repo with at least 1 tag mkdir git-repo cd git-repo git init >/dev/null 2>&1 echo a > a git add a action commit -m "rev1" action tag -m "tag1" tag1 cd .. # Do a first conversion convertrepo # Simulate upstream updates after first conversion cd git-repo echo b > a git add a action commit -m "rev2" action tag -m "tag2" tag2 cd .. # Perform an incremental conversion convertrepo # Print the log cd hg-repo glog