convert: fix test-convert-svn-* problems with mtime not changing

The `svn commit` command does not detect changed files unless
their mtime has changed. A quick succession of, for instance,
`svn co ...; echo x >> y; svn ci` can thus lead to the change to y
being ignored.

Edited by pmezard to write in binary mode.

tests/svn-safe-append.py

@@ -0,0 +1,25
+#!/usr/bin/env python
+
+__doc__ = """Same as `echo a >> b`, but ensures a changed mtime of b.
+Without this svn will not detect workspace changes."""
+
+import sys, os
+
+text = sys.argv[1]
+fname = sys.argv[2]
+
+f = open(fname, "ab")
+try:
+    before = os.fstat(f.fileno()).st_mtime
+    f.write(text)
+    f.write("\n")
+finally:
+    f.close()
+inc = 1
+now = os.stat(fname).st_mtime
+while now == before:
+    t = now + inc
+    inc += 1
+    os.utime(fname, (t, t))
+    now = os.stat(fname).st_mtime
+

tests/test-convert-svn-branches

@@ -1,89 +1,89
 #!/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 hello > trunk/letter.txt
 echo hey > trunk/letter2.txt
 echo ho > trunk/letter3.txt
 svn add trunk/letter.txt trunk/letter2.txt trunk/letter3.txt
 svn ci -m hello
 
 echo % branch to old letters
 svn copy trunk branches/old
 svn rm branches/old/letter3.txt
 svn ci -m "branch trunk, remove letter3"
 svn up
 
 echo % update trunk
-echo "what can I say ?" >> trunk/letter.txt
+"$TESTDIR/svn-safe-append.py" "what can I say ?" trunk/letter.txt
 svn ci -m "change letter"
 
 echo % update old branch
-echo "what's up ?" >> branches/old/letter2.txt
+"$TESTDIR/svn-safe-append.py" "what's up ?" branches/old/letter2.txt
 svn ci -m "change letter2"
 
 echo % create a cross-branch revision
 svn move -m "move letter2" trunk/letter2.txt \
     branches/old/letter3.txt
-echo "I am fine" >> branches/old/letter3.txt
+"$TESTDIR/svn-safe-append.py" "I am fine" branches/old/letter3.txt
 svn ci -m "move and update letter3.txt"
 
 echo % update old branch again
-echo "bye" >> branches/old/letter2.txt
+"$TESTDIR/svn-safe-append.py" "bye" branches/old/letter2.txt
 svn ci -m "change letter2 again"
 
 echo % update trunk again
-echo "how are you ?" >> trunk/letter.txt
+"$TESTDIR/svn-safe-append.py" "how are you ?" trunk/letter.txt
 svn ci -m "last change to letter"
 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/old2
 svn ci -m "branch trunk@1 into old2"
 cd ..
 
 echo % convert again
 hg convert --datesort $svnurl A-hg
 
 cd A-hg
 hg glog --template '#rev# #desc|firstline# files: #files#\n'
 hg branches | sed 's/:.*/:/'
 hg tags -q
 cd ..

tests/test-convert-svn-move

@@ -1,65 +1,65
 #!/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
 echo b > trunk/d1/b
 echo c > trunk/d1/c
 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
-echo a >> trunk/a
-echo c >> trunk/d1/c
+"$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 up
-echo b >> subproject/trunk/d1/b
+"$TESTDIR/svn-safe-append.py" b subproject/trunk/d1/b
 svn ci -m changeb
 svn mv $svnurl/subproject/trunk/d1 $svnurl/subproject/branches/d1 -m moved1again
 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-sink

@@ -1,135 +1,135
 #!/bin/sh
 
 "$TESTDIR/hghave" svn svn-bindings || exit 80
 
 fixpath()
 {
     tr '\\' /
 }
 
 svnupanddisplay()
 {
     (
        cd $1;
        svn up;
        svn st -v | fixpath
        limit=''
        if [ $2 -gt 0 ]; then
            limit="--limit=$2"
        fi
        svn log --xml -v $limit | fixpath | sed 's,<date>.*,<date/>,'
     )
 }
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
 
 hg init a
 
 echo a > a/a
 mkdir -p a/d1/d2
 echo b > a/d1/d2/b
 echo % add
 hg --cwd a ci -d '0 0' -A -m 'add a file'
 
-echo a >> a/a
+"$TESTDIR/svn-safe-append.py" a a/a
 echo % modify
 hg --cwd a ci -d '1 0' -m 'modify a file'
 hg --cwd a tip -q
 
 hg convert -d svn a
 svnupanddisplay a-hg-wc 2
 ls a a-hg-wc
 cmp a/a a-hg-wc/a && echo same || echo different
 
 hg --cwd a mv a b
 echo % rename
 hg --cwd a ci -d '2 0' -m 'rename a file'
 hg --cwd a tip -q
 
 hg convert -d svn a
 svnupanddisplay a-hg-wc 1
 ls a a-hg-wc
 
 hg --cwd a cp b c
 echo % copy
 hg --cwd a ci -d '3 0' -m 'copy a file'
 hg --cwd a tip -q
 
 hg convert -d svn a
 svnupanddisplay a-hg-wc 1
 ls a a-hg-wc
 
 hg --cwd a rm b
 echo % remove
 hg --cwd a ci -d '4 0' -m 'remove a file'
 hg --cwd a tip -q
 
 hg convert -d svn a
 svnupanddisplay a-hg-wc 1
 ls a a-hg-wc
 
 chmod +x a/c
 echo % executable
 hg --cwd a ci -d '5 0' -m 'make a file executable'
 hg --cwd a tip -q
 
 hg convert -d svn a
 svnupanddisplay a-hg-wc 1
 test -x a-hg-wc/c && echo executable || echo not executable
 
 echo % executable in new directory
 
 rm -rf a a-hg a-hg-wc
 hg init a
 
 mkdir a/d1
 echo a > a/d1/a
 chmod +x a/d1/a
 hg --cwd a ci -d '0 0' -A -m 'add executable file in new directory'
 
 hg convert -d svn a
 svnupanddisplay a-hg-wc 1
 test -x a-hg-wc/d1/a && echo executable || echo not executable
 
 echo % copy to new directory
 
 mkdir a/d2
 hg --cwd a cp d1/a d2/a
 hg --cwd a ci -d '1 0' -A -m 'copy file to new directory'
 
 hg convert -d svn a
 svnupanddisplay a-hg-wc 1
 
 echo % branchy history
 
 hg init b
 echo base > b/b
 hg --cwd b ci -d '0 0' -Ambase
 
-echo left-1 >> b/b
+"$TESTDIR/svn-safe-append.py" left-1 b/b
 echo left-1 > b/left-1
 hg --cwd b ci -d '1 0' -Amleft-1
 
-echo left-2 >> b/b
+"$TESTDIR/svn-safe-append.py" left-2 b/b
 echo left-2 > b/left-2
 hg --cwd b ci -d '2 0' -Amleft-2
 
 hg --cwd b up 0
 
-echo right-1 >> b/b
+"$TESTDIR/svn-safe-append.py" right-1 b/b
 echo right-1 > b/right-1
 hg --cwd b ci -d '3 0' -Amright-1
 
-echo right-2 >> b/b
+"$TESTDIR/svn-safe-append.py" right-2 b/b
 echo right-2 > b/right-2
 hg --cwd b ci -d '4 0' -Amright-2
 
 hg --cwd b up -C 2
 hg --cwd b merge
 hg --cwd b revert -r 2 b
 hg --cwd b ci -d '5 0' -m 'merge'
 
 hg convert -d svn b
 echo % expect 4 changes
 svnupanddisplay b-hg-wc 0

tests/test-convert-svn-source

@@ -1,89 +1,89
 #!/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 "# now tests that it works with trunk/tags layout, but no branches yet"
 echo
 echo % initial svn import
 mkdir projB
 cd projB
 mkdir trunk
 mkdir tags
 cd ..
 
 svnurl=file://$svnpath/svn-repo/projB
 svn import -m "init projB" projB $svnurl | fix_path
 
 
 echo % update svn repository
 svn co $svnurl/trunk B | fix_path
 cd B
 echo hello > letter.txt
 svn add letter.txt
 svn ci -m hello
 
-echo world >> letter.txt
+"$TESTDIR/svn-safe-append.py" world letter.txt
 svn ci -m world
 
 svn copy -m "tag v0.1" $svnurl/trunk $svnurl/tags/v0.1
 
-echo 'nice day today!' >> letter.txt
+"$TESTDIR/svn-safe-append.py" 'nice day today!' letter.txt
 svn ci -m "nice day"
 cd ..
 
 echo % convert to hg once
 hg convert $svnurl B-hg
 
 echo % update svn repository again
 cd B
-echo "see second letter" >> letter.txt
+"$TESTDIR/svn-safe-append.py" "see second letter" letter.txt
 echo "nice to meet you" > letter2.txt
 svn add letter2.txt
 svn ci -m "second letter"
 
 svn copy -m "tag v0.2" $svnurl/trunk $svnurl/tags/v0.2
 
-echo "blah-blah-blah" >> letter2.txt
+"$TESTDIR/svn-safe-append.py" "blah-blah-blah" letter2.txt
 svn ci -m "work in progress"
 cd ..
 
 ########################################
 
 echo % test incremental conversion
 hg convert $svnurl B-hg
 
 cd B-hg
 hg glog --template '#rev# #desc|firstline# files: #files#\n'
 hg tags -q
 cd ..
 
 echo % test filemap
 echo 'include letter2.txt' > filemap
 hg convert --filemap filemap $svnurl/trunk fmap
 hg glog -R fmap --template '#rev# #desc|firstline# files: #files#\n'
 
 echo % test stop revision
 hg convert --rev 1 $svnurl/trunk stoprev
 # Check convert_revision extra-records.
 # This is also the only place testing more than one extra field
 # in a revision.
 hg --cwd stoprev tip --debug | grep extra | sed 's/=.*/=/'

tests/test-convert-svn-startrev

@@ -1,81 +1,81
 #!/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
 svn add trunk/a trunk/b
 svn ci -m createab
 svn rm trunk/b
 svn ci -m removeb
 svn up
-echo a >> trunk/a
+"$TESTDIR/svn-safe-append.py" a trunk/a
 svn ci -m changeaa
 
 echo % branch
 svn up
 svn copy trunk branches/branch1
-echo a >> branches/branch1/a
+"$TESTDIR/svn-safe-append.py" a branches/branch1/a
 svn ci -m "branch, changeaaa"
 
-echo a >> branches/branch1/a
+"$TESTDIR/svn-safe-append.py" a branches/branch1/a
 echo c > branches/branch1/c
 svn add branches/branch1/c
 svn ci -m "addc,changeaaaa"
 svn up
 cd ..
 
 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
     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,76 +1,76
 #!/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
 
 echo % update svn repository
 svn co $svnurl A | fix_path
 cd A
 echo a > trunk/a
 svn add trunk/a
 svn ci -m adda
-echo a >> trunk/a
+"$TESTDIR/svn-safe-append.py" a trunk/a
 svn ci -m changea
-echo a >> trunk/a
+"$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
-echo a >> unrelated/dummy
+"$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"
-echo a >> trunk/a
+"$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