Mercurial > hg
annotate tests/test-mactext.t @ 44642:da9b7f9635a2
tests: use `f --hexdump` to print file content
The inline print.py in this test wasn't fully compatible with
Python 3 because it was reading from sys.stdin, which already
normalized line endings since it operates in the realm of str on
Python 3. To do this correctly, we'd need to read from
sys.stdin.buffer on Python 3. This would entail conditional code.
I felt this was too much effort. So I just replaced the custom
script with `f`, which already knows how to do the right thing.
test-mactext.t now passes on Python 3 on Windows.
Differential Revision: https://phab.mercurial-scm.org/D8336
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Sat, 28 Mar 2020 13:29:25 -0700 |
parents | 5abc47d4ca6b |
children | 768056549737 |
rev | line source |
---|---|
6481
e837dded56c7
win32text: Add macencode/macdecode
OHASHI Hideya <ohachige@gmail.com>
parents:
diff
changeset
|
1 |
12458 | 2 $ cat > unix2mac.py <<EOF |
3 > import sys | |
4 > | |
5 > for path in sys.argv[1:]: | |
36023
adec6374a0b2
py3: replace file() with open() in test-mactext.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32940
diff
changeset
|
6 > data = open(path, 'rb').read() |
adec6374a0b2
py3: replace file() with open() in test-mactext.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32940
diff
changeset
|
7 > data = data.replace(b'\n', b'\r') |
adec6374a0b2
py3: replace file() with open() in test-mactext.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32940
diff
changeset
|
8 > open(path, 'wb').write(data) |
12458 | 9 > EOF |
10 $ hg init | |
11 $ echo '[hooks]' >> .hg/hgrc | |
12 $ echo 'pretxncommit.cr = python:hgext.win32text.forbidcr' >> .hg/hgrc | |
13 $ echo 'pretxnchangegroup.cr = python:hgext.win32text.forbidcr' >> .hg/hgrc | |
14 $ cat .hg/hgrc | |
15 [hooks] | |
16 pretxncommit.cr = python:hgext.win32text.forbidcr | |
17 pretxnchangegroup.cr = python:hgext.win32text.forbidcr | |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
12458
diff
changeset
|
18 |
12458 | 19 $ echo hello > f |
20 $ hg add f | |
21 $ hg ci -m 1 | |
15243
1e9451476bf8
tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com>
parents:
12458
diff
changeset
|
22 |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
36023
diff
changeset
|
23 $ "$PYTHON" unix2mac.py f |
12458 | 24 $ hg ci -m 2 |
16932
7985a9e2ddce
win32text: lowercase warning message
Martin Geisler <mg@aragost.com>
parents:
15243
diff
changeset
|
25 attempt to commit or push text file(s) using CR line endings |
12458 | 26 in dea860dc51ec: f |
27 transaction abort! | |
28 rollback completed | |
29 abort: pretxncommit.cr hook failed | |
30 [255] | |
44642
da9b7f9635a2
tests: use `f --hexdump` to print file content
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39707
diff
changeset
|
31 $ hg cat f | f --hexdump |
da9b7f9635a2
tests: use `f --hexdump` to print file content
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39707
diff
changeset
|
32 |
da9b7f9635a2
tests: use `f --hexdump` to print file content
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39707
diff
changeset
|
33 0000: 68 65 6c 6c 6f 0a |hello.| |
da9b7f9635a2
tests: use `f --hexdump` to print file content
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39707
diff
changeset
|
34 $ f --hexdump f |
da9b7f9635a2
tests: use `f --hexdump` to print file content
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39707
diff
changeset
|
35 f: |
da9b7f9635a2
tests: use `f --hexdump` to print file content
Gregory Szorc <gregory.szorc@gmail.com>
parents:
39707
diff
changeset
|
36 0000: 68 65 6c 6c 6f 0d |hello.| |