test-win32text: avoid unix2dos, printf extensions

tests/test-win32text

@@ -1,56 +1,65
 #!/bin/sh
 
+cat > unix2dos.py <<EOF 
+import sys
+
+for path in sys.argv[1:]:
+    data = file(path, 'rb').read()
+    data = data.replace('\n', '\r\n')
+    file(path, 'wb').write(data)
+EOF
+
 hg init
 echo '[hooks]' >> .hg/hgrc
 echo 'pretxncommit.crlf = python:hgext.win32text.forbidcrlf' >> .hg/hgrc
 echo 'pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf' >> .hg/hgrc
 cat .hg/hgrc
 echo
 
 echo hello > f
 hg add f
 hg ci -m 1 -d'0 0'
 echo
 
-unix2dos f
+python unix2dos.py f
 hg ci -m 2 -d'0 0'
 hg revert -a
 echo
 
 mkdir d
 echo hello > d/f2
-unix2dos d/f2
+python unix2dos.py d/f2
 hg add d/f2
 hg ci -m 3 -d'0 0'
 hg revert -a
 rm d/f2
 echo
 
 hg rem f
 hg ci -m 4 -d'0 0'
 echo
 
-printf 'hello\x00\x0D\x0A' > bin
+python -c 'file("bin", "wb").write("hello\x00\x0D\x0A")'
 hg add bin
 hg ci -m 5 -d'0 0'
 hg log -v
 echo
 
 hg clone . dupe
 echo
 for x in a b c d; do echo content > dupe/$x; done
 hg -R dupe add
-unix2dos dupe/b dupe/c dupe/d
+python unix2dos.py dupe/b dupe/c dupe/d
 hg -R dupe ci -m a -d'0 0' dupe/a
 hg -R dupe ci -m b/c -d'0 0' dupe/[bc]
 hg -R dupe ci -m d -d'0 0' dupe/d
 hg -R dupe log -v
 echo
 
 hg pull dupe
 echo
 
 hg log -v
 echo
 
 # XXX missing tests for encode/decode hooks

tests/test-win32text.out

@@ -1,157 +1,157
 [hooks]
 pretxncommit.crlf = python:hgext.win32text.forbidcrlf
 pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf
 
 
 Attempt to commit or push text file(s) using CRLF line endings
 in b1aa5cde7ff4: f
 transaction abort!
 rollback completed
 abort: pretxncommit.crlf hook failed
 reverting f
 
 Attempt to commit or push text file(s) using CRLF line endings
 in 88b17af74937: d/f2
 transaction abort!
 rollback completed
 abort: pretxncommit.crlf hook failed
 forgetting d/f2
 
 
-changeset:   2:a55cab36df04
+changeset:   2:b67b2dae057a
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       bin
 description:
 5
 
 
 changeset:   1:c72a7d1d0907
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f
 description:
 4
 
 
 changeset:   0:fcf06d5c4e1d
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f
 description:
 1
 
 
 
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 adding dupe/a
 adding dupe/b
 adding dupe/c
 adding dupe/d
-changeset:   5:81c49ee61396
+changeset:   5:6e8a7629ff5b
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       d
 description:
 d
 
 
-changeset:   4:02184785bcac
+changeset:   4:ac30a42ce8bc
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       b c
 description:
 b/c
 
 
-changeset:   3:36e70ffe2c3d
+changeset:   3:a73b85ef1fb7
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       a
 description:
 a
 
 
-changeset:   2:a55cab36df04
+changeset:   2:b67b2dae057a
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       bin
 description:
 5
 
 
 changeset:   1:c72a7d1d0907
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f
 description:
 4
 
 
 changeset:   0:fcf06d5c4e1d
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f
 description:
 1
 
 
 
 pulling from dupe
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 3 changesets with 4 changes to 4 files
 Attempt to commit or push text file(s) using CRLF line endings
-in 02184785bcac: b
-in 02184785bcac: c
-in 81c49ee61396: d
+in ac30a42ce8bc: b
+in ac30a42ce8bc: c
+in 6e8a7629ff5b: d
 
 To prevent this mistake in your local repository,
 add to Mercurial.ini or .hg/hgrc:
 
 [hooks]
 pretxncommit.crlf = python:hgext.win32text.forbidcrlf
 
 and also consider adding:
 
 [extensions]
 hgext.win32text =
 [encode]
 ** = cleverencode:
 [decode]
 ** = cleverdecode:
 transaction abort!
 rollback completed
 abort: pretxnchangegroup.crlf hook failed
 
-changeset:   2:a55cab36df04
+changeset:   2:b67b2dae057a
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       bin
 description:
 5
 
 
 changeset:   1:c72a7d1d0907
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f
 description:
 4
 
 
 changeset:   0:fcf06d5c4e1d
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f
 description:
 1