This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9987

tests: fix differing output between py2 and py3
ClosedPublic

Authored by Alphare on Feb 12 2021, 6:57 AM.

Details

Reviewers
durin42
SimonSapin
Group Reviewers
hg-reviewers
Commits
rHGc3c7a86e9c24: tests: fix differing output between py2 and py3
Summary

db9e33beb0fb broke the tests because of the difference in bytestring repr
between py2 and py3. Rather than backout that change for so little, I figured
I'd fix it myself.
Hopefully Python 2 supports gets dropped very soon.

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

Alphare created this revision.Feb 12 2021, 6:57 AM
SimonSapin accepted this revision.Feb 12 2021, 8:37 AM
Alphare added a commit: rHGc3c7a86e9c24: tests: fix differing output between py2 and py3.Feb 12 2021, 11:29 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGc3c7a86e9c24: tests: fix differing output between py2 and py3 (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changegroup.py (2 lines)
Mtests/test-narrow-pull.t (2 lines)

Diff 25610

mercurial/changegroup.py

# where this breaks down a bit. That said, I don't # where this breaks down a bit. That said, I don't
# know if it would hurt anything. # know if it would hurt anything.
for i in pycompat.xrange(rev, 0, -1): for i in pycompat.xrange(rev, 0, -1):
if store.linkrev(i) == clrev: if store.linkrev(i) == clrev:
return i return i
# We failed to resolve a parent for this node, so # We failed to resolve a parent for this node, so
# we crash the changegroup construction. # we crash the changegroup construction.
raise error.Abort( raise error.Abort(
b'unable to resolve parent while packing %r %r' b"unable to resolve parent while packing '%s' %r"
b' for changeset %r' % (store.indexfile, rev, clrev) b' for changeset %r' % (store.indexfile, rev, clrev)
) )
return nullrev return nullrev
if not linkparents or (store.parentrevs(rev) == (nullrev, nullrev)): if not linkparents or (store.parentrevs(rev) == (nullrev, nullrev)):
p1, p2 = nullrev, nullrev p1, p2 = nullrev, nullrev
elif len(linkparents) == 1: elif len(linkparents) == 1:

tests/test-narrow-pull.t

28: Update#2 to f9 28: Update#2 to f9
Can pull into repo with a single commit Can pull into repo with a single commit
$ cd .. $ cd ..
$ hg clone -q --narrow ssh://user@dummy/master narrow2 --include "f1" -r 0 $ hg clone -q --narrow ssh://user@dummy/master narrow2 --include "f1" -r 0
$ cd narrow2 $ cd narrow2
$ hg pull -q -r 1 $ hg pull -q -r 1
remote: abort: unexpected error: unable to resolve parent while packing b'00manifest.i' 1 for changeset 0 remote: abort: unexpected error: unable to resolve parent while packing '00manifest.i' 1 for changeset 0
transaction abort! transaction abort!
rollback completed rollback completed
abort: pull failed on remote abort: pull failed on remote
[255] [255]