# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 2009-06-09 19:50:42
# Node ID 9c75f16f577c74f2433f63c3bb63458c9b8c7b31
# Parent  46b5b4301fcc251dcfdfa645fde4817c21b68288

test-convert-svn-*: no longer need the url building code

diff --git a/tests/test-convert-svn-branches b/tests/test-convert-svn-branches
--- a/tests/test-convert-svn-branches
+++ b/tests/test-convert-svn-branches
@@ -14,23 +14,14 @@ echo "hgext.graphlog =" >> $HGRCPATH
 svnadmin create svn-repo
 cat "$TESTDIR/svn/branches.svndump" | svnadmin load svn-repo > /dev/null
 
-svnpath=`pwd | fix_path`
-# SVN wants all paths to start with a slash. Unfortunately,
-# Windows ones don't. Handle that.
-expr $svnpath : "\/" > /dev/null
-if [ $? -ne 0 ]; then
-    svnpath='/'$svnpath
-fi
-svnurl=file://$svnpath/svn-repo
-
 echo % convert trunk and branches
 cat >branchmap <<EOF
 old3 newbranch
 EOF
-hg convert --branchmap=branchmap --datesort -r 10 $svnurl A-hg
+hg convert --branchmap=branchmap --datesort -r 10 svn-repo A-hg
 
 echo % convert again
-hg convert --branchmap=branchmap --datesort $svnurl A-hg
+hg convert --branchmap=branchmap --datesort svn-repo A-hg
 
 cd A-hg
 hg glog --template 'branch={branches} {rev} {desc|firstline} files: {files}\n'
diff --git a/tests/test-convert-svn-startrev b/tests/test-convert-svn-startrev
--- a/tests/test-convert-svn-startrev
+++ b/tests/test-convert-svn-startrev
@@ -14,15 +14,6 @@ echo "hgext.graphlog =" >> $HGRCPATH
 svnadmin create svn-repo
 cat "$TESTDIR/svn/startrev.svndump" | svnadmin load svn-repo > /dev/null
 
-svnpath=`pwd | fix_path`
-# SVN wants all paths to start with a slash. Unfortunately,
-# Windows ones don't. Handle that.
-expr $svnpath : "\/" > /dev/null
-if [ $? -ne 0 ]; then
-    svnpath='/'$svnpath
-fi
-svnurl=file://$svnpath/svn-repo
-
 convert()
 {
     startrev=$1
@@ -31,7 +22,7 @@ convert()
         --config convert.svn.trunk=branches/branch1 \
         --config convert.svn.branches="  " \
         --config convert.svn.tags= \
-        --datesort $svnurl $repopath
+        --datesort svn-repo $repopath
     hg -R $repopath glog --template '{rev} {desc|firstline} files: {files}\n'
     echo
 }
diff --git a/tests/test-convert-svn-tags b/tests/test-convert-svn-tags
--- a/tests/test-convert-svn-tags
+++ b/tests/test-convert-svn-tags
@@ -14,17 +14,8 @@ echo "hgext.graphlog =" >> $HGRCPATH
 svnadmin create svn-repo
 cat "$TESTDIR/svn/tags.svndump" | svnadmin load svn-repo > /dev/null
 
-svnpath=`pwd | fix_path`
-# SVN wants all paths to start with a slash. Unfortunately,
-# Windows ones don't. Handle that.
-expr $svnpath : "\/" > /dev/null
-if [ $? -ne 0 ]; then
-    svnpath='/'$svnpath
-fi
-svnurl=file://$svnpath/svn-repo
-
 echo % convert
-hg convert --datesort $svnurl A-hg
+hg convert --datesort svn-repo A-hg
 
 cd A-hg
 hg glog --template '{rev} {desc|firstline} tags: {tags}\n'
@@ -32,6 +23,6 @@ hg tags | sed 's/:.*/:/'
 cd ..
 
 echo % convert without tags
-hg convert --datesort --config convert.svn.tags= $svnurl A-notags-hg
+hg convert --datesort --config convert.svn.tags= svn-repo A-notags-hg
 hg -R A-notags-hg tags -q