Mercurial > hg
view tests/test-import-eol @ 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 | 7936cd261dc9 |
children |
line wrap: on
line source
#!/bin/sh cat > makepatch.py <<EOF f = file('eol.diff', 'wb') w = f.write w('test message\n') w('diff --git a/a b/a\n') w('--- a/a\n') w('+++ b/a\n') w('@@ -1,5 +1,5 @@\n') w(' a\n') w('-bbb\r\n') w('+yyyy\r\n') w(' cc\r\n') w(' \n') w(' d\n') w('-e\n') w('\ No newline at end of file\n') w('+z\r\n') w('\ No newline at end of file\r\n') EOF hg init repo cd repo echo '\.diff' > .hgignore # Test different --eol values python -c 'file("a", "wb").write("a\nbbb\ncc\n\nd\ne")' hg ci -Am adda python ../makepatch.py echo % invalid eol hg --config patch.eol='LFCR' import eol.diff hg revert -a echo % force LF hg --traceback --config patch.eol='LF' import eol.diff python -c 'print repr(file("a","rb").read())' hg st echo % force CRLF hg up -C 0 hg --traceback --config patch.eol='CRLF' import eol.diff python -c 'print repr(file("a","rb").read())' hg st echo % auto EOL on LF file hg up -C 0 hg --traceback --config patch.eol='auto' import eol.diff python -c 'print repr(file("a","rb").read())' hg st echo % auto EOL on CRLF file python -c 'file("a", "wb").write("a\r\nbbb\r\ncc\r\n\r\nd\r\ne")' hg commit -m 'switch EOLs in a' hg --traceback --config patch.eol='auto' import eol.diff python -c 'print repr(file("a","rb").read())' hg st echo % auto EOL on new file or source without any EOL python -c 'file("noeol", "wb").write("noeol")' hg add noeol hg commit -m 'add noeol' python -c 'file("noeol", "wb").write("noeol\r\nnoeol\n")' python -c 'file("neweol", "wb").write("neweol\nneweol\r\n")' hg add neweol hg diff --git > noeol.diff hg revert --no-backup noeol neweol rm neweol hg --traceback --config patch.eol='auto' import -m noeol noeol.diff python -c 'print repr(file("noeol","rb").read())' python -c 'print repr(file("neweol","rb").read())' hg st # Test --eol and binary patches python -c 'file("b", "wb").write("a\x00\nb\r\nd")' hg ci -Am addb python -c 'file("b", "wb").write("a\x00\nc\r\nd")' hg diff --git > bin.diff hg revert --no-backup b echo % binary patch with --eol hg import --config patch.eol='CRLF' -m changeb bin.diff python -c 'print repr(file("b","rb").read())' hg st cd ..