Mercurial > hg
view tests/test-issue2137 @ 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 | 6bbe4886740e |
children |
line wrap: on
line source
#!/bin/sh echo "% setup" # create a little extension that has 3 side-effects: # 1) ensure changelog data is not inlined # 2) make revlog to use lazyparser # 3) test that repo.lookup() works # 1 and 2 are preconditions for the bug; 3 is the bug. cat > commitwrapper.py <<EOF from mercurial import extensions, node, revlog def reposetup(ui, repo): def wrapcommit(orig, *args, **kwargs): result = orig(*args, **kwargs) tip1 = node.short(repo.changelog.tip()) tip2 = node.short(repo.lookup(tip1)) assert tip1 == tip2 ui.write('new tip: %s\n' % tip1) return result extensions.wrapfunction(repo, 'commit', wrapcommit) def extsetup(ui): revlog._maxinline = 8 # split out 00changelog.d early revlog._prereadsize = 8 # use revlog.lazyparser EOF cat >> $HGRCPATH <<EOF [extensions] commitwrapper = `pwd`/commitwrapper.py EOF hg init repo1 cd repo1 echo a > a hg commit -A -m'add a with a long commit message to make the changelog a bit bigger' echo "" echo "% test that new changesets are visible to repo.lookup()" echo a >> a hg commit -m'one more commit to demonstrate the bug' hg tip