Mercurial > hgsubversion
view tests/fixtures/externals.sh @ 717:ae5968ffe6fe
svnwrap: fix handling of quotable URLs (fixes #197, refs #132)
The way hgsubversion handles URLs that may or may not be quoted is
somewhat fragile. As part of fixing issue 132 in 925ff8c5989c, the
path component of URLs was always quoted. The URL has been attempted
encoded since the initial check-in.
The fix from 925ff8c5989c was incomplete; reverting it allows us to
clone a URL with a '~' in it.[1] Encoding the URL as UTF-8 seldom
works as expected, as the default string encoding is ASCII, causing
Python to be unable to decode any URL containing an 8-bit
character.
The core problem here is that we don't know whether the URL specified
by the user is quoted or not. Rather than trying to deal with this
ourselves, we pass the problem on to Subversion. Then, we obtain the
URL from the RA instance, where it is always quoted. (It's worth
noting that the editor interface, on the other hand, always deals with
unquoted paths...)
Thus, the following invariants should apply to SubversionRepo
attributes:
- svn_url and root will always be quoted.
- subdir will always be unquoted.
Tests are added that verify that it won't affect the conversion
whether a URL is specified in quoted or unquoted form. Furthermore, a
test fixture for this is added *twice*, so that we can thoroughly test
both quoted and unquoted URLs. I'm not adding a test dedicated to
tildes in URLs; it doesn't seem necessary.
[1] Such as <https://svn.kenai.com/svn/winsw~subversion>.
| author | Dan Villiom Podlaski Christiansen <danchr@gmail.com> |
|---|---|
| date | Mon, 04 Oct 2010 21:00:36 -0500 |
| parents | 963d27a0b1c2 |
| children | a5be5ca638de |
line wrap: on
line source
#!/bin/sh # # Generate externals.svndump # mkdir temp cd temp mkdir project-orig cd project-orig mkdir trunk mkdir branches mkdir externals cd .. svnadmin create testrepo svnurl=file://`pwd`/testrepo svn import project-orig $svnurl -m "init project" svn co $svnurl project cd project/externals mkdir project1 echo a > project1/a svn add project1 mkdir project2 echo a > project2/b svn add project2 svn ci -m "configure externals projects" cd ../trunk # Add an external reference echo a > a svn add a cat > externals <<EOF ^/externals/project1 deps/project1 EOF svn propset -F externals svn:externals . svn ci -m "set externals on ." # Add another one cat > externals <<EOF ^/externals/project1 deps/project1 -r2 ^/externals/project2@2 deps/project2 EOF svn propset -F externals svn:externals . svn ci -m "update externals on ." # Suppress an external and add one on a subdir cat > externals <<EOF -r2 ^/externals/project2@2 deps/project2 EOF svn propset -F externals svn:externals . mkdir subdir mkdir subdir2 svn add subdir subdir2 cat > externals <<EOF ^/externals/project1 deps/project1 EOF svn propset -F externals svn:externals subdir subdir2 svn ci -m "add on subdir" # Test branch with externals svn up cd ../branches svn copy ../trunk branch1 svn propdel svn:externals branch1/subdir2 svn ci -m 'externals in subtree' # Test branch with externals, removing on copy root svn copy ../trunk branch2 svn propdel svn:externals branch2 branch2/subdir2 svn ci -m 'externals in subtree, removed on root' cd ../trunk # Suppress the subdirectory svn rm --force subdir svn ci -m 'remove externals subdir' # Remove the property on subdir2 svn propdel svn:externals subdir2 svn ci -m 'remove externals subdir2' # Kill project2 externals, peg revision should preserve it cd .. svn up svn rm externals/project2 svn ci -m 'remove externals project2' cd trunk echo a >> a svn ci -m 'change a' cd ../.. svnadmin dump testrepo > ../externals.svndump