This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5424

py3: use util.buffer instead of buffer in remotefilelog
AbandonedPublic

Authored by pulkit on Dec 14 2018, 11:42 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

This fixes test-remotefilelog-bundles.t on Python 3.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Dec 14 2018, 11:42 AM
yuja added a subscriber: yuja.Dec 14 2018, 8:19 PM
  • if isinstance(text, buffer):

+ if isinstance(text, util.buffer):

text = str(text)

util.buffer isn't a type object on Python 3. Given str(text) didn't
explode, such cases wouldn't be covered by the tests.

pulkit abandoned this revision.Jan 29 2019, 6:56 AM

Revision Contents
Changeset List

Diff 12849

contrib/python3-whitelist

test-rebuildstate.t test-rebuildstate.t
test-record.t test-record.t
test-releasenotes-formatting.t test-releasenotes-formatting.t
test-releasenotes-merging.t test-releasenotes-merging.t
test-releasenotes-parsing.t test-releasenotes-parsing.t
test-relink.t test-relink.t
test-remotefilelog-bad-configs.t test-remotefilelog-bad-configs.t
test-remotefilelog-blame.t test-remotefilelog-blame.t
test-remotefilelog-bundles.t
test-remotefilelog-clone-tree.t test-remotefilelog-clone-tree.t
test-remotefilelog-clone.t test-remotefilelog-clone.t
test-remotefilelog-keepset.t test-remotefilelog-keepset.t
test-remotefilelog-partial-shallow.t test-remotefilelog-partial-shallow.t
test-remotefilelog-prefetch.t test-remotefilelog-prefetch.t
test-remotefilelog-share.t test-remotefilelog-share.t
test-remotefilelog-tags.t test-remotefilelog-tags.t
test-remove.t test-remove.t

hgext/remotefilelog/shallowbundle.py

from mercurial.node import bin, hex, nullid from mercurial.node import bin, hex, nullid
from mercurial import ( from mercurial import (
bundlerepo, bundlerepo,
changegroup, changegroup,
error, error,
match, match,
mdiff, mdiff,
pycompat, pycompat,
util,
) )
from . import ( from . import (
constants, constants,
remotefilelog, remotefilelog,
shallowutil, shallowutil,
) )
NoFiles = 0 NoFiles = 0
# 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 isinstance(text, util.buffer):
text = str(text) text = str(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