This is an archive of the discontinued Mercurial Phabricator instance.

In D3218#51610, @yuja wrote:

print(nonascii) may fail depending on the locale.
We have to use getattr(sys.stdout, 'buffer', sys.stdout) or pycompat.stdout.

I get the following failure:

--- /home/foobar/repo/hg-committed/tests/test-mq-qpush-fail.t
+++ /home/foobar/repo/hg-committed/tests/test-mq-qpush-fail.t.err
@@ -60,7 +60,7 @@
   cleaning up working directory...
   reverting foo
   done
-  abort: decoding near '\xe9': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)! (esc)
+  abort: decoding near '\xe9From: tes': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)! (esc)
   [255]
   $ hg parents
   changeset:   0:bbd179dfa0a7

I see that you advised same on D2334 and I got the above failure that time too and was unable to followup. Any ideas on this failure? I tried stdout.flush() too.

Maybe you didn't add "\n".

pulkit retitled this revision from py3: use print as a function in test-mq-qpush-fail.t to py3: use sys.stdout instead of print in test-mq-qpush-fail.t.Apr 11 2018, 7:21 AM

pulkit updated this revision to Diff 7964.

In D3218#51878, @yuja wrote:

Maybe you didn't add "\n".

Yep, I didn't add "\n". Thanks a lot!

pulkit mentioned this in D2334: py3: use print as a function in test-mq-push-fail.t.Apr 11 2018, 7:22 AM

Queued, thanks. I've dropped unneeded flush(), and added b''.

Closed by commit rHG5d81f1b7051b: py3: use sys.stdout instead of print in test-mq-qpush-fail.t (authored by pulkit). · Explain WhyApr 11 2018, 8:31 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/test-mq-qpush-fail.t (2 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	7930		Apr 10 2018, 10:15 AM	★	★
Diff 2	7964		Apr 11 2018, 7:20 AM	★	★
Diff 3	7970	rHG5d81f1b7051b0b202e83b4b9d3a7d404e45b574f	Apr 10 2018, 9:27 AM	★	★

Status	Author	Revision
Closed	pulkit	D3244 py3: use pycompat.bytestr() where repr in involved
Closed	pulkit	D3220 py3: make sure we write bytes to file
Closed	pulkit	D3219 py3: workaround comparing NoneType and integers
Closed	pulkit	D3218 py3: use sys.stdout instead of print in test-mq-qpush-fail.t
Closed	pulkit	D3217 py3: use '//' for integer division in tests/test-mq-qimport.t
Closed	pulkit	D3216 py3: use pycompat.byterepr() instead of repr()
Closed	pulkit	D3215 py3: use bytes instead of str in isinstance()
Closed	pulkit	D3214 py3: use .startswith() instead of bytes[0]

Diff 7964

tests/test-mq-qpush-fail.t

	$ hg qnew --config 'mq.plain=true' -U bad-patch			$ hg qnew --config 'mq.plain=true' -U bad-patch
	$ echo >> foo			$ echo >> foo
	$ hg qrefresh			$ hg qrefresh
	$ hg qpop -a			$ hg qpop -a
	popping bad-patch			popping bad-patch
	popping patch2			popping patch2
	popping patch1			popping patch1
	patch queue now empty			patch queue now empty
	$ $PYTHON -c 'print "\xe9"' > message			$ $PYTHON -c 'import sys; stdout = getattr(sys.stdout, "buffer", sys.stdout); stdout.flush(); stdout.write("\xe9\n")' > message
	$ cat .hg/patches/bad-patch >> message			$ cat .hg/patches/bad-patch >> message
	$ mv message .hg/patches/bad-patch			$ mv message .hg/patches/bad-patch
	$ cat > $TESTTMP/wrapplayback.py <<EOF			$ cat > $TESTTMP/wrapplayback.py <<EOF
	> import os			> import os
	> from mercurial import extensions, transaction			> from mercurial import extensions, transaction
	> def wrapplayback(orig,			> def wrapplayback(orig,
	> journal, report, opener, vfsmap, entries, backupentries,			> journal, report, opener, vfsmap, entries, backupentries,
	> unlink=True, checkambigfiles=None):			> unlink=True, checkambigfiles=None):

This is an archive of the discontinued Mercurial Phabricator instance.

py3: use sys.stdout instead of print in test-mq-qpush-fail.tClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 7964

tests/test-mq-qpush-fail.t

py3: use sys.stdout instead of print in test-mq-qpush-fail.t
ClosedPublic

Revision Contents
Changeset List