Fix subversion tests with svn 1.5

tests/test-convert-svn-branches

@@ -1,98 +1,98 b''
 #!/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
 
 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
 
 echo % initial svn import
 mkdir projA
 cd projA
 mkdir trunk
 mkdir branches
 mkdir tags
 cd ..
 
 svnurl=file://$svnpath/svn-repo/projA
 svn import -m "init projA" projA $svnurl | fix_path
 
 echo % update svn repository
 svn co $svnurl A | fix_path
 cd A
 echo a > trunk/a
 echo b > trunk/b
 echo c > trunk/c
 # Add a file within branches, used to confuse branch detection
 echo d > branches/notinbranch
 svn add trunk/a trunk/b trunk/c branches/notinbranch
 svn ci -m hello
 
 echo % branch to old
 svn copy trunk branches/old
 svn rm branches/old/c
 svn ci -m "branch trunk, remove c"
 svn up
 
 echo % update trunk
 "$TESTDIR/svn-safe-append.py" a trunk/a
 svn ci -m "change a"
 
 echo % update old branch
 "$TESTDIR/svn-safe-append.py" b branches/old/b
 svn ci -m "change b"
 
 echo % create a cross-branch revision
-svn move -m "move b" trunk/b branches/old/c
+svn move trunk/b branches/old/c
 "$TESTDIR/svn-safe-append.py" c branches/old/c
 svn ci -m "move and update c"
 
 echo % update old branch again
 "$TESTDIR/svn-safe-append.py" b branches/old/b
 svn ci -m "change b again"
 
 echo % move back and forth between branch of similar names
 # This used to generate fake copy records
 svn up
 svn move branches/old branches/old2
 svn ci -m "move to old2"
 svn move branches/old2 branches/old
 svn ci -m "move back to old"
 
 echo % update trunk again
 "$TESTDIR/svn-safe-append.py" a trunk/a
 svn ci -m "last change to a"
 cd ..
 
 echo % convert trunk and branches
 hg convert --datesort $svnurl A-hg
 
 echo % branch again from a converted revision
 cd A
 svn copy -r 1 $svnurl/trunk branches/old3
 svn ci -m "branch trunk@1 into old3"
 cd ..
 
 echo % convert again
 hg convert --datesort $svnurl 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-move

@@ -1,73 +1,82 b''
 #!/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
 
 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
 
 echo % initial svn import
 mkdir projA
 cd projA
 mkdir trunk
 echo a > trunk/a
 mkdir trunk/d1
 mkdir trunk/d2
 echo b > trunk/d1/b
 echo c > trunk/d1/c
 echo d > trunk/d2/d
 cd ..
 
 svnurl=file://$svnpath/svn-repo/projA
 svn import -m "init projA" projA $svnurl | fix_path
 
 # Build a module renaming chain which used to confuse the converter.
 echo % update svn repository
 svn co $svnurl A | fix_path
 cd A
 "$TESTDIR/svn-safe-append.py" a trunk/a
 "$TESTDIR/svn-safe-append.py" c trunk/d1/c
 svn ci -m commitbeforemove
 svn mv $svnurl/trunk $svnurl/subproject -m movedtrunk
 svn up
 mkdir subproject/trunk
 svn add subproject/trunk
 svn ci -m createtrunk
 mkdir subproject/branches
 svn add subproject/branches
 svn ci -m createbranches
 svn mv $svnurl/subproject/d1 $svnurl/subproject/trunk/d1 -m moved1
 svn mv $svnurl/subproject/d2 $svnurl/subproject/trunk/d2 -m moved2
 svn up
 "$TESTDIR/svn-safe-append.py" b subproject/trunk/d1/b
 svn rm subproject/trunk/d2
 svn ci -m "changeb and rm d2"
 svn mv $svnurl/subproject/trunk/d1 $svnurl/subproject/branches/d1 -m moved1again
+
+if svn help copy | grep 'SRC\[@REV\]' > /dev/null 2>&1; then
+    # SVN >= 1.5 replaced the -r REV syntax with @REV
+    echo % copy a file from a past revision
+    svn copy $svnurl/subproject/trunk/d2/d@7 $svnurl/subproject/trunk -m copyfilefrompast
+    echo % copy a directory from a past revision
+    svn copy $svnurl/subproject/trunk/d2@7 $svnurl/subproject/trunk -m copydirfrompast
+else
 echo % copy a file from a past revision
 svn copy -r 7 $svnurl/subproject/trunk/d2/d $svnurl/subproject/trunk -m copyfilefrompast
 echo % copy a directory from a past revision
 svn copy -r 7 $svnurl/subproject/trunk/d2 $svnurl/subproject/trunk -m copydirfrompast
+fi
 cd ..
 
 echo % convert trunk and branches
 hg convert --datesort $svnurl/subproject A-hg
 
 cd A-hg
 hg glog --template '#rev# #desc|firstline# files: #files#\n'
 hg branches | sed 's/:.*/:/'
 cd ..

tests/test-convert-svn-tags

@@ -1,76 +1,76 b''
 #!/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
 
 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
 
 echo % initial svn import
 mkdir projA
 cd projA
 mkdir trunk
 mkdir branches
 mkdir tags
 mkdir unrelated
 cd ..
 
 svnurl=file://$svnpath/svn-repo/projA
-svn import -m "init projA" projA $svnurl | fix_path
+svn import -m "init projA" projA $svnurl | fix_path | sort
 
 echo % update svn repository
 svn co $svnurl A | fix_path
 cd A
 echo a > trunk/a
 svn add trunk/a
 svn ci -m adda
 "$TESTDIR/svn-safe-append.py" a trunk/a
 svn ci -m changea
 "$TESTDIR/svn-safe-append.py" a trunk/a
 svn ci -m changea2
 # Add an unrelated commit to test that tags are bound to the
 # correct "from" revision and not a dummy one
 "$TESTDIR/svn-safe-append.py" a unrelated/dummy
 svn add unrelated/dummy
 svn ci -m unrelatedchange
 echo % tag current revision
 svn up
 svn copy trunk tags/trunk.v1
 svn copy trunk tags/trunk.badtag
 svn ci -m "tagging trunk.v1 trunk.badtag"
 "$TESTDIR/svn-safe-append.py" a trunk/a
 svn ci -m changea3
 echo % fix the bad tag
 # trunk.badtag should not show in converted tags
 svn up
 svn mv tags/trunk.badtag tags/trunk.goodtag
 svn ci -m "fix trunk.badtag"
 cd ..
 
 echo % convert
 hg convert --datesort $svnurl A-hg
 
 cd A-hg
 hg glog --template '#rev# #desc|firstline# tags: #tags#\n'
 hg tags -q
 cd ..
 
 echo % convert without tags
 hg convert --datesort --config convert.svn.tags= $svnurl A-notags-hg
 hg -R A-notags-hg tags -q
 

tests/test-convert-svn-tags.out

@@ -1,84 +1,84 b''
 % initial svn import
+
+Adding         projA/branches
+Adding         projA/tags
 Adding         projA/trunk
 Adding         projA/unrelated
-Adding         projA/branches
-Adding         projA/tags
-
 Committed revision 1.
 % update svn repository
 A    A/trunk
 A    A/unrelated
 A    A/branches
 A    A/tags
 Checked out revision 1.
 A         trunk/a
 Adding         trunk/a
 Transmitting file data .
 Committed revision 2.
 Sending        trunk/a
 Transmitting file data .
 Committed revision 3.
 Sending        trunk/a
 Transmitting file data .
 Committed revision 4.
 A         unrelated/dummy
 Adding         unrelated/dummy
 Transmitting file data .
 Committed revision 5.
 % tag current revision
 At revision 5.
 A         tags/trunk.v1
 A         tags/trunk.badtag
 Adding         tags/trunk.badtag
 Adding         tags/trunk.v1
 
 Committed revision 6.
 Sending        trunk/a
 Transmitting file data .
 Committed revision 7.
 % fix the bad tag
 At revision 7.
 A         tags/trunk.goodtag
 D         tags/trunk.badtag/a
 D         tags/trunk.badtag
 Deleting       tags/trunk.badtag
 Adding         tags/trunk.goodtag
 
 Committed revision 8.
 % convert
 initializing destination A-hg repository
 scanning source...
 sorting...
 converting...
 4 init projA
 3 adda
 2 changea
 1 changea2
 0 changea3
 updating tags
 o  5 update tags tags: tip
 |
 o  4 changea3 tags:
 |
 o  3 changea2 tags: trunk.v1 trunk.goodtag
 |
 o  2 changea tags:
 |
 o  1 adda tags:
 |
 o  0 init projA tags:
 
 tip
 trunk.v1
 trunk.goodtag
 % convert without tags
 initializing destination A-notags-hg repository
 scanning source...
 sorting...
 converting...
 4 init projA
 3 adda
 2 changea
 1 changea2
 0 changea3
 tip