changeset 5680:963c516bb38c

test-win32text: avoid unix2dos, printf extensions
author Patrick Mezard <pmezard@gmail.com>
date Fri, 21 Dec 2007 00:13:00 +0100
parents 1d8ef9fb3e88
children 40db4f03085d
files tests/test-win32text tests/test-win32text.out
diffstat 2 files changed, 22 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-win32text	Thu Dec 20 07:05:40 2007 -0500
+++ b/tests/test-win32text	Fri Dec 21 00:13:00 2007 +0100
@@ -1,5 +1,14 @@
 #!/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
@@ -12,14 +21,14 @@
 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
@@ -30,7 +39,7 @@
 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
@@ -40,7 +49,7 @@
 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
--- a/tests/test-win32text.out	Thu Dec 20 07:05:40 2007 -0500
+++ b/tests/test-win32text.out	Fri Dec 21 00:13:00 2007 +0100
@@ -18,7 +18,7 @@
 forgetting d/f2
 
 
-changeset:   2:a55cab36df04
+changeset:   2:b67b2dae057a
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
@@ -50,7 +50,7 @@
 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
@@ -59,7 +59,7 @@
 d
 
 
-changeset:   4:02184785bcac
+changeset:   4:ac30a42ce8bc
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       b c
@@ -67,7 +67,7 @@
 b/c
 
 
-changeset:   3:36e70ffe2c3d
+changeset:   3:a73b85ef1fb7
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       a
@@ -75,7 +75,7 @@
 a
 
 
-changeset:   2:a55cab36df04
+changeset:   2:b67b2dae057a
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       bin
@@ -107,9 +107,9 @@
 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:
@@ -129,7 +129,7 @@
 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