This is an archive of the discontinued Mercurial Phabricator instance.

tests: force newlines to LF in inline Python script
Needs RevisionPublic

Authored by indygreg on Mar 29 2020, 9:30 PM.

Download Raw Diff

Details

Reviewers

marmoute
baymax

Group Reviewers

hg-reviewers

Summary

Like we've done in what seems like an infinite stream of random
scripts, we need to set sys.stdout to normalize to LF on
Python 3 on Windows or else CRLF can creep in.

With this change, test-fix.t now passes on Python 3 on Windows.

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

indygreg created this revision.Mar 29 2020, 9:30 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptMar 29 2020, 9:30 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

looks legit.

actually @mharbison72 comment on D8345 make me reconsider. Please allign the status of this with the status of D8345.

marmoute accepted this revision.Apr 17 2020, 4:01 PM

There seems to have been no activities on this Diff for the past 3 Months.

By policy, we are automatically moving it out of the need-review state.

Please, move it back to need-review without hesitation if this diff should still be discussed.

:baymax:need-review-idle:

This revision now requires changes to proceed.Jul 31 2020, 1:56 PM

Herald added a subscriber: mercurial-patches. · View Herald TranscriptJul 31 2020, 1:56 PM

Revision Contents
Changeset List

			Path	Packages
M			tests/test-fix.t (9 lines)

Commit	Parents	Author	Summary	Date
e35a620eab7d	fb9e6399e615	Gregory Szorc		Mar 29 2020, 8:54 PM

Status	Author	Revision
Needs Revision	indygreg	D8348 tests: force newlines to LF in inline Python script
Needs Revision	indygreg	D8347 encoding: use special dictionary type for env variables on Windows
Needs Revision	indygreg	D8346 tests: force newlines to LF in tinyproxy.py
Needs Revision	indygreg	D8345 tests: look for CRLF on Windows
Closed	indygreg	D8344 extensions: refactor function for obtaining disabled extension help
Closed	indygreg	D8343 tests: perform grep manually in test-doctest.py
Closed	indygreg	D8342 tests: prevent printing \r to stdout
Closed	indygreg	D8341 tests: force \n newlines when writing to sys.stdout
Abandoned	indygreg	D8340 dispatch: force \n for newlines on sys.std* streams (BC)
Closed	indygreg	D8339 dispatch: force \n for newlines on sys.std* streams (BC)
Closed	indygreg	D8338 hook: move stdio redirection to context manager

Diff 20921

tests/test-fix.t

	A script that implements uppercasing of specific lines in a file. This			A script that implements uppercasing of specific lines in a file. This
	approximates the behavior of code formatters well enough for our tests.			approximates the behavior of code formatters well enough for our tests.

	$ UPPERCASEPY="$TESTTMP/uppercase.py"			$ UPPERCASEPY="$TESTTMP/uppercase.py"
	$ cat > $UPPERCASEPY <<EOF			$ cat > $UPPERCASEPY <<EOF
				> import io
	> import sys			> import sys
	> from mercurial.utils.procutil import setbinary			> from mercurial.utils.procutil import setbinary
	> setbinary(sys.stdin)			> setbinary(sys.stdin)
	> setbinary(sys.stdout)			> setbinary(sys.stdout)
				> if sys.version_info[0] >= 3:
				> sys.stdout = io.TextIOWrapper(
				> sys.stdout.buffer,
				> sys.stdout.encoding,
				> sys.stdout.errors,
				> newline="\n",
				> line_buffering=sys.stdout.line_buffering,
				> )
	> lines = set()			> lines = set()
	> for arg in sys.argv[1:]:			> for arg in sys.argv[1:]:
	> if arg == 'all':			> if arg == 'all':
	> sys.stdout.write(sys.stdin.read().upper())			> sys.stdout.write(sys.stdin.read().upper())
	> sys.exit(0)			> sys.exit(0)
	> else:			> else:
	> first, last = arg.split('-')			> first, last = arg.split('-')
	> lines.update(range(int(first), int(last) + 1))			> lines.update(range(int(first), int(last) + 1))

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	20921			Mar 29 2020, 9:30 PM	★	★