Mercurial > public > mercurial-scm > hg-stable

diff tests/test-mq-subrepo-svn.t @ 17033:0413f68da85c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: cleanup of svn url handling The subversion tests used different tricks to create properly encoded URLs, partly due to partial support for different ways of running the tests on windows. Now we only need/support one way of running the tests on windows. Windows URLs should look like 'file:///c:/foo%20bar' and on Unix platforms like 'file:///tmp/baz'. 'pwd' in the test framework will on Windows emit paths like 'c:/foo bar'. Explicit handling of backslashes in paths is thus no longer needed and is removed. Paths on windows do however need an extra '/' compared to other platforms. This change makes test-subrepo-svn.t pass on windows with msys. Other tests might need more work.
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 26 Jun 2012 03:35:22 +0200
parents f2719b387380
children 7a9cbb315d84
line wrap: on
line diff
--- a/tests/test-mq-subrepo-svn.t	Sat Jun 23 19:54:08 2012 +0300
+++ b/tests/test-mq-subrepo-svn.t	Tue Jun 26 03:35:22 2012 +0200
@@ -16,21 +16,23 @@
 handle svn subrepos safely
 
   $ svnadmin create svn-repo-2499
-  $ curpath=`pwd | tr '\\\\' /`
-  $ expr "$svnpath" : "\/" > /dev/null
-  > if [ $? -ne 0 ]; then
-  >   curpath="/$curpath"
-  > fi
-  $ svnurl="file://$curpath/svn-repo-2499/project"
+
+  $ SVNREPOPATH=`pwd`/svn-repo-2499/project
+#if windows
+  $ SVNREPOURL=file:///`python -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
+#else
+  $ SVNREPOURL=file://`python -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
+#endif
+
   $ mkdir -p svn-project-2499/trunk
-  $ svn import -m 'init project' svn-project-2499 "$svnurl"
+  $ svn import -m 'init project' svn-project-2499 "$SVNREPOURL"
   Adding         svn-project-2499/trunk (glob)
   
   Committed revision 1.
 
 qnew on repo w/svn subrepo
   $ mkrepo repo-2499-svn-subrepo
-  $ svn co "$svnurl"/trunk sub
+  $ svn co "$SVNREPOURL"/trunk sub
   Checked out revision 1.
   $ echo 'sub = [svn]sub' >> .hgsub
   $ hg add .hgsub