This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8336

tests: use `f --hexdump` to print file content
ClosedPublic

Authored by indygreg on Mar 28 2020, 9:40 PM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHGda9b7f9635a2: tests: use `f --hexdump` to print file content
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Mar 28 2020, 9:40 PM
marmoute accepted this revision.Apr 1 2020, 4:18 AM
marmoute added a subscriber: marmoute.

sure

indygreg added a commit: rHGda9b7f9635a2: tests: use `f --hexdump` to print file content.Apr 1 2020, 11:22 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGda9b7f9635a2: tests: use `f --hexdump` to print file content (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-mactext.t (14 lines)

Diff 20941

tests/test-mactext.t

$ cat > unix2mac.py <<EOF $ cat > unix2mac.py <<EOF
> import sys > import sys
> >
> for path in sys.argv[1:]: > for path in sys.argv[1:]:
> data = open(path, 'rb').read() > data = open(path, 'rb').read()
> data = data.replace(b'\n', b'\r') > data = data.replace(b'\n', b'\r')
> open(path, 'wb').write(data) > open(path, 'wb').write(data)
> EOF > EOF
$ cat > print.py <<EOF
> import sys
> print(sys.stdin.read().replace('\n', '<LF>').replace('\r', '<CR>').replace('\0', '<NUL>'))
> EOF
$ hg init $ hg init
$ echo '[hooks]' >> .hg/hgrc $ echo '[hooks]' >> .hg/hgrc
$ echo 'pretxncommit.cr = python:hgext.win32text.forbidcr' >> .hg/hgrc $ echo 'pretxncommit.cr = python:hgext.win32text.forbidcr' >> .hg/hgrc
$ echo 'pretxnchangegroup.cr = python:hgext.win32text.forbidcr' >> .hg/hgrc $ echo 'pretxnchangegroup.cr = python:hgext.win32text.forbidcr' >> .hg/hgrc
$ cat .hg/hgrc $ cat .hg/hgrc
[hooks] [hooks]
pretxncommit.cr = python:hgext.win32text.forbidcr pretxncommit.cr = python:hgext.win32text.forbidcr
pretxnchangegroup.cr = python:hgext.win32text.forbidcr pretxnchangegroup.cr = python:hgext.win32text.forbidcr
$ echo hello > f $ echo hello > f
$ hg add f $ hg add f
$ hg ci -m 1 $ hg ci -m 1
$ "$PYTHON" unix2mac.py f $ "$PYTHON" unix2mac.py f
$ hg ci -m 2 $ hg ci -m 2
attempt to commit or push text file(s) using CR line endings attempt to commit or push text file(s) using CR line endings
in dea860dc51ec: f in dea860dc51ec: f
transaction abort! transaction abort!
rollback completed rollback completed
abort: pretxncommit.cr hook failed abort: pretxncommit.cr hook failed
[255] [255]
$ hg cat f | "$PYTHON" print.py $ hg cat f | f --hexdump
hello<LF>
$ cat f | "$PYTHON" print.py 0000: 68 65 6c 6c 6f 0a |hello.|
hello<CR> $ f --hexdump f
f:
0000: 68 65 6c 6c 6f 0d |hello.|