This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5679

py3: fix missing b prefixes in `hg eval` invocations in test-arbitraryfilectx.t
ClosedPublic

Authored by durin42 on Jan 24 2019, 11:41 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG5361f9ed8a30: py3: fix missing b prefixes in test-arbitraryfilectx.t
Summary

Test passes on Python 3.

  1. skip-blame b prefixes

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

durin42 created this revision.Jan 24 2019, 11:41 AM
pulkit accepted this revision.Jan 24 2019, 11:48 AM
pulkit added a comment.Jan 24 2019, 12:02 PM

reworded commit message as py3: fix missing b prefixes in test-arbitraryfilectx.t to make test-check-commit.t happy.

Closed by commit rHG5361f9ed8a30: py3: fix missing b prefixes in test-arbitraryfilectx.t (authored by durin42). · Explain WhyJan 24 2019, 12:03 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 13402

contrib/python3-whitelist

test-abort-checkin.t test-abort-checkin.t
test-absorb-edit-lines.t test-absorb-edit-lines.t
test-absorb-filefixupstate.py test-absorb-filefixupstate.py
test-absorb-phase.t test-absorb-phase.t
test-absorb-rename.t test-absorb-rename.t
test-absorb-strip.t test-absorb-strip.t
test-absorb.t test-absorb.t
test-add.t test-add.t
test-addremove-similar.t test-addremove-similar.t
test-addremove.t test-addremove.t
test-alias.t test-alias.t
test-amend-subrepo.t test-amend-subrepo.t
test-amend.t test-amend.t
test-ancestor.py test-ancestor.py
test-annotate.py test-annotate.py
test-annotate.t test-annotate.t
test-arbitraryfilectx.t
test-archive-symlinks.t test-archive-symlinks.t
test-archive.t test-archive.t
test-atomictempfile.py test-atomictempfile.py
test-audit-path.t test-audit-path.t
test-audit-subrepo.t test-audit-subrepo.t
test-automv.t test-automv.t
test-backout.t test-backout.t
test-backwards-remove.t test-backwards-remove.t

tests/test-arbitraryfilectx.t

> \ No newline at end of file > \ No newline at end of file
> EOF > EOF
$ hg up -q $ hg up -q
#endif #endif
These files are different and should return True (different): These files are different and should return True (different):
(Note that filecmp.cmp's return semantics are inverted from ours, so we invert (Note that filecmp.cmp's return semantics are inverted from ours, so we invert
for simplicity): for simplicity):
$ hg eval "context.arbitraryfilectx('A', repo).cmp(repo[None]['real_A'])" $ hg eval "context.arbitraryfilectx(b'A', repo).cmp(repo[None][b'real_A'])"
True (no-eol) True (no-eol)
$ hg eval "not filecmp.cmp('A', 'real_A')" $ hg eval "not filecmp.cmp(b'A', b'real_A')"
True (no-eol) True (no-eol)
These files are identical and should return False (same): These files are identical and should return False (same):
$ hg eval "context.arbitraryfilectx('A', repo).cmp(repo[None]['A'])" $ hg eval "context.arbitraryfilectx(b'A', repo).cmp(repo[None][b'A'])"
False (no-eol) False (no-eol)
$ hg eval "context.arbitraryfilectx('A', repo).cmp(repo[None]['B'])" $ hg eval "context.arbitraryfilectx(b'A', repo).cmp(repo[None][b'B'])"
False (no-eol) False (no-eol)
$ hg eval "not filecmp.cmp('A', 'B')" $ hg eval "not filecmp.cmp(b'A', b'B')"
False (no-eol) False (no-eol)
This comparison should also return False, since A and sym_A are substantially This comparison should also return False, since A and sym_A are substantially
the same in the eyes of ``filectx.cmp``, which looks at data only. the same in the eyes of ``filectx.cmp``, which looks at data only.
$ hg eval "context.arbitraryfilectx('real_A', repo).cmp(repo[None]['sym_A'])" $ hg eval "context.arbitraryfilectx(b'real_A', repo).cmp(repo[None][b'sym_A'])"
False (no-eol) False (no-eol)
A naive use of filecmp on those two would wrongly return True, since it follows A naive use of filecmp on those two would wrongly return True, since it follows
the symlink to "A", which has different contents. the symlink to "A", which has different contents.
#if symlink #if symlink
$ hg eval "not filecmp.cmp('real_A', 'sym_A')" $ hg eval "not filecmp.cmp(b'real_A', b'sym_A')"
True (no-eol) True (no-eol)
#else #else
$ hg eval "not filecmp.cmp('real_A', 'sym_A')" $ hg eval "not filecmp.cmp(b'real_A', b'sym_A')"
False (no-eol) False (no-eol)
#endif #endif