This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3833

py3: make tests/test-diff-antipatience.t work with python 3
ClosedPublic

Authored by pulkit on Jun 25 2018, 4:44 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG9ef9884e5d50: py3: make tests/test-diff-antipatience.t work with python 3
Summary

On python3, if we do list(b'abcd'), we get [97, 98, 99, 100]. So this patch does
the list() operation on unicodes and then convert things to bytes.

This also adds and None to suppress return values of .write() calls.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Jun 25 2018, 4:44 PM
Closed by commit rHG9ef9884e5d50: py3: make tests/test-diff-antipatience.t work with python 3 (authored by pulkit). · Explain WhyJun 26 2018, 8:10 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 9293

contrib/python3-whitelist

test-copy.t test-copy.t
test-copytrace-heuristics.t test-copytrace-heuristics.t
test-debugbuilddag.t test-debugbuilddag.t
test-debugbundle.t test-debugbundle.t
test-debugextensions.t test-debugextensions.t
test-debugindexdot.t test-debugindexdot.t
test-debugrename.t test-debugrename.t
test-default-push.t test-default-push.t
test-diff-antipatience.t
test-diff-binary-file.t test-diff-binary-file.t
test-diff-change.t test-diff-change.t
test-diff-copy-depth.t test-diff-copy-depth.t
test-diff-hashes.t test-diff-hashes.t
test-diff-ignore-whitespace.t test-diff-ignore-whitespace.t
test-diff-indent-heuristic.t test-diff-indent-heuristic.t
test-diff-issue2761.t test-diff-issue2761.t
test-diff-newlines.t test-diff-newlines.t

tests/test-diff-antipatience.t

#testcases bdiff xdiff #testcases bdiff xdiff
#if xdiff #if xdiff
#require xdiff #require xdiff
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [experimental] > [experimental]
> xdiff = true > xdiff = true
> EOF > EOF
#endif #endif
Test case that makes use of the weakness of patience diff algorithm Test case that makes use of the weakness of patience diff algorithm
$ hg init $ hg init
>>> open('a', 'wb').write(b'\n'.join(list(b'a' + b'x' * 10 + b'u' + b'x' * 30 + b'a\n'))) >>> open('a', 'wb').write(('\n'.join(list('a' + 'x' * 10 + 'u' + 'x' * 30 + 'a\n'))).encode('ascii')) and None
$ hg commit -m 1 -A a $ hg commit -m 1 -A a
>>> open('a', 'wb').write(b'\n'.join(list(b'b' + b'x' * 30 + b'u' + b'x' * 10 + b'b\n'))) >>> open('a', 'wb').write(('\n'.join(list('b' + 'x' * 30 + 'u' + 'x' * 10 + 'b\n'))).encode('ascii')) and None
#if xdiff #if xdiff
$ hg diff $ hg diff
diff -r f0aeecb49805 a diff -r f0aeecb49805 a
--- a/a Thu Jan 01 00:00:00 1970 +0000 --- a/a Thu Jan 01 00:00:00 1970 +0000
+++ b/a Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-a -a
+b +b