This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5606

remotefilelog: check against bytes type instead of buffer and coerce to bytes
ClosedPublic

Authored by durin42 on Jan 16 2019, 11:16 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGebda5d4265ec: remotefilelog: check against bytes type instead of buffer and coerce to bytes
Summary

Fixes Python 3 compat here.

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.

Revision Contents
Changeset List

Diff 13286

hgext/remotefilelog/shallowbundle.py

# revisiondata: (node, p1, p2, cs, deltabase, delta, flags) # revisiondata: (node, p1, p2, cs, deltabase, delta, flags)
node, p1, p2, linknode, deltabase, delta, flags = revisiondata node, p1, p2, linknode, deltabase, delta, flags = revisiondata
if not available(f, node, f, deltabase): if not available(f, node, f, deltabase):
continue continue
base = fl.revision(deltabase, raw=True) base = fl.revision(deltabase, raw=True)
text = mdiff.patch(base, delta) text = mdiff.patch(base, delta)
if isinstance(text, buffer): if not isinstance(text, bytes):
text = str(text) text = bytes(text)
meta, text = shallowutil.parsemeta(text) meta, text = shallowutil.parsemeta(text)
if 'copy' in meta: if 'copy' in meta:
copyfrom = meta['copy'] copyfrom = meta['copy']
copynode = bin(meta['copyrev']) copynode = bin(meta['copyrev'])
if not available(f, node, copyfrom, copynode): if not available(f, node, copyfrom, copynode):
continue continue