( )⚙ D2077 py3: make sure we open the file in bytes mode

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2077

py3: make sure we open the file in bytes mode
ClosedPublic

Authored by pulkit on Feb 7 2018, 4:02 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG80e5210df25c: py3: make sure we open the file in bytes mode
Summary
  1. skip-blame because we are just adding b

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

pulkit created this revision.Feb 7 2018, 4:02 AM
durin42 accepted this revision.Feb 7 2018, 6:15 AM
This revision is now accepted and ready to land.Feb 7 2018, 6:15 AM
Closed by commit rHG80e5210df25c: py3: make sure we open the file in bytes mode (authored by pulkit). · Explain WhyFeb 7 2018, 6:23 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-check-help.t (2 lines)
Mtests/test-conflict.t (2 lines)

Diff 5291

tests/test-check-help.t

#require test-repo #require test-repo
$ . "$TESTDIR/helpers-testrepo.sh" $ . "$TESTDIR/helpers-testrepo.sh"
$ cat <<'EOF' > scanhelptopics.py $ cat <<'EOF' > scanhelptopics.py
> from __future__ import absolute_import, print_function > from __future__ import absolute_import, print_function
> import re > import re
> import sys > import sys
> if sys.platform == "win32": > if sys.platform == "win32":
> import os, msvcrt > import os, msvcrt
> msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) > msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
> topics = set() > topics = set()
> topicre = re.compile(br':hg:`help ([a-z0-9\-.]+)`') > topicre = re.compile(br':hg:`help ([a-z0-9\-.]+)`')
> for fname in sys.argv: > for fname in sys.argv:
> with open(fname) as f: > with open(fname, 'rb') as f:
> topics.update(m.group(1) for m in topicre.finditer(f.read())) > topics.update(m.group(1) for m in topicre.finditer(f.read()))
> for s in sorted(topics): > for s in sorted(topics):
> print(s) > print(s)
> EOF > EOF
$ cd "$TESTDIR"/.. $ cd "$TESTDIR"/..
Check if ":hg:`help TOPIC`" is valid: Check if ":hg:`help TOPIC`" is valid:
(use "xargs -n1 -t" to see which help commands are executed) (use "xargs -n1 -t" to see which help commands are executed)
$ testrepohg files 'glob:{hgdemandimport,hgext,mercurial}/**/*.py' \ $ testrepohg files 'glob:{hgdemandimport,hgext,mercurial}/**/*.py' \
> | sed 's|\\|/|g' \ > | sed 's|\\|/|g' \
> | xargs $PYTHON "$TESTTMP/scanhelptopics.py" \ > | xargs $PYTHON "$TESTTMP/scanhelptopics.py" \
> | xargs -n1 hg help > /dev/null > | xargs -n1 hg help > /dev/null

tests/test-conflict.t

5 5
>>>>>>> merge rev: test 1 >>>>>>> merge rev: test 1
Hop we are done. Hop we are done.
Verify line trimming of custom conflict marker using multi-byte characters Verify line trimming of custom conflict marker using multi-byte characters
$ hg up -q --clean . $ hg up -q --clean .
$ $PYTHON <<EOF $ $PYTHON <<EOF
> fp = open('logfile', 'w') > fp = open('logfile', 'wb')
> fp.write(b'12345678901234567890123456789012345678901234567890' + > fp.write(b'12345678901234567890123456789012345678901234567890' +
> b'1234567890') # there are 5 more columns for 80 columns > b'1234567890') # there are 5 more columns for 80 columns
> >
> # 2 x 4 = 8 columns, but 3 x 4 = 12 bytes > # 2 x 4 = 8 columns, but 3 x 4 = 12 bytes
> fp.write(u'\u3042\u3044\u3046\u3048'.encode('utf-8')) > fp.write(u'\u3042\u3044\u3046\u3048'.encode('utf-8'))
> >
> fp.close() > fp.close()
> EOF > EOF