This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3218

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

Authored by pulkit on Apr 10 2018, 10:15 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG5d81f1b7051b: py3: use sys.stdout instead of print in test-mq-qpush-fail.t
Summary

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.Apr 10 2018, 10:15 AM
yuja requested changes to this revision.Apr 10 2018, 11:20 AM
yuja added a subscriber: yuja.

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

This revision now requires changes to proceed.Apr 10 2018, 11:20 AM
pulkit added a comment.Apr 11 2018, 5:19 AM
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.

yuja added a comment.Apr 11 2018, 7:06 AM

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.
pulkit added a comment.Apr 11 2018, 7:21 AM
In D3218#51878, @yuja wrote:

Maybe you didn't add "\n".

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

yuja added a comment.Apr 11 2018, 7:49 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

PathPackages
Mtests/test-mq-qpush-fail.t (2 lines)

Diff 7970

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; getattr(sys.stdout, "buffer", sys.stdout).write(b"\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):