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

tests/test-convert-svn-branches

@@ -1,39 +1,30
 #!/bin/sh
 
 "$TESTDIR/hghave" svn svn-bindings || exit 80
 
 fix_path()
 {
     tr '\\' /
 }
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
 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'
 hg branches | sed 's/:.*/:/'
 hg tags -q
 cd ..

tests/test-convert-svn-startrev

@@ -1,46 +1,37
 #!/bin/sh
 
 "$TESTDIR/hghave" svn svn-bindings || exit 80
 
 fix_path()
 {
     tr '\\' /
 }
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
 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
     repopath=A-r$startrev-hg
     hg convert --config convert.svn.startrev=$startrev \
         --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
 }
 
 echo % convert before branching point
 convert 3
 echo % convert before branching point
 convert 4
 echo % convert at branching point
 convert 5
 echo % convert last revision only
 convert 6

tests/test-convert-svn-tags

@@ -1,37 +1,28
 #!/bin/sh
 
 "$TESTDIR/hghave" svn svn-bindings || exit 80
 
 fix_path()
 {
     tr '\\' /
 }
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
 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'
 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