This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7538

pvec: fix a `str` type conditional for py3
ClosedPublic

Authored by mharbison72 on Nov 30 2019, 12:09 PM.

Details

Reviewers
dlax
pulkit
Group Reviewers
hg-reviewers
Commits
rHG10662ac7849e: pvec: fix a `str` type conditional for py3

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

mharbison72 created this revision.Nov 30 2019, 12:09 PM
dlax accepted this revision.Dec 1 2019, 8:02 AM
pulkit accepted this revision.Dec 2 2019, 10:07 AM
This revision is now accepted and ready to land.Dec 2 2019, 10:07 AM
mharbison72 added a commit: rHG10662ac7849e: pvec: fix a `str` type conditional for py3.Dec 2 2019, 4:55 PM
Closed by commit rHG10662ac7849e: pvec: fix a `str` type conditional for py3 (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 18431

mercurial/pvec.py

else: else:
pvc[n] = _mergevec(pvc[p1], pvc[p2], node) pvc[n] = _mergevec(pvc[p1], pvc[p2], node)
bs = _join(*pvc[ctx.rev()]) bs = _join(*pvc[ctx.rev()])
return pvec(util.b85encode(bs)) return pvec(util.b85encode(bs))
class pvec(object): class pvec(object):
def __init__(self, hashorctx): def __init__(self, hashorctx):
if isinstance(hashorctx, str): if isinstance(hashorctx, bytes):
self._bs = hashorctx self._bs = hashorctx
self._depth, self._vec = _split(util.b85decode(hashorctx)) self._depth, self._vec = _split(util.b85decode(hashorctx))
else: else:
self._vec = ctxpvec(hashorctx) self._vec = ctxpvec(hashorctx)
def __str__(self): def __str__(self):
return self._bs return self._bs