This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4206

changegroup: extract cgpacker.group() to standalone function
ClosedPublic

Authored by indygreg on Aug 9 2018, 4:52 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG9e8eb2b444e5: changegroup: extract cgpacker.group() to standalone function
Summary

It doesn't need to be part of the packer class.

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

indygreg created this revision.Aug 9 2018, 4:52 PM
durin42 added a subscriber: durin42.Aug 9 2018, 10:16 PM
durin42 added inline comments.
mercurial/changegroup.py
689

nit: bytes

(follow-up please, to avoid turnaround time issues)

indygreg marked an inline comment as done.Aug 9 2018, 10:18 PM
indygreg added inline comments.
mercurial/changegroup.py
689

I rewrite the docstring later in the series. I was trying to optimize for review by not changing anything as part of the code move :)

indygreg marked an inline comment as done.Aug 9 2018, 10:24 PM
Closed by commit rHG9e8eb2b444e5: changegroup: extract cgpacker.group() to standalone function (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changegroup.py (167 lines)

Diff 10230

mercurial/changegroup.py

p1node=p1n, p1node=p1n,
p2node=p2n, p2node=p2n,
basenode=nullid, basenode=nullid,
linknode=linknode, linknode=linknode,
flags=flags, flags=flags,
deltachunks=(diffheader, data), deltachunks=(diffheader, data),
) )
class cgpacker(object): def deltagroup(repo, revs, store, ischangelog, lookup, deltaparentfn,
def __init__(self, repo, filematcher, version, allowreorder,
deltaparentfn, builddeltaheader, manifestsend,
bundlecaps=None, ellipses=False,
shallow=False, ellipsisroots=None, fullnodes=None):
"""Given a source repo, construct a bundler.
filematcher is a matcher that matches on files to include in the
changegroup. Used to facilitate sparse changegroups.
allowreorder controls whether reordering of revisions is allowed.
This value is used when ``bundle.reorder`` is ``auto`` or isn't
set.
deltaparentfn is a callable that resolves the delta parent for
a specific revision.
builddeltaheader is a callable that constructs the header for a group
delta.
manifestsend is a chunk to send after manifests have been fully emitted.
ellipses indicates whether ellipsis serving mode is enabled.
bundlecaps is optional and can be used to specify the set of
capabilities which can be used to build the bundle. While bundlecaps is
unused in core Mercurial, extensions rely on this feature to communicate
capabilities to customize the changegroup packer.
shallow indicates whether shallow data might be sent. The packer may
need to pack file contents not introduced by the changes being packed.
fullnodes is the set of changelog nodes which should not be ellipsis
nodes. We store this rather than the set of nodes that should be
ellipsis because for very large histories we expect this to be
significantly smaller.
"""
assert filematcher
self._filematcher = filematcher
self.version = version
self._deltaparentfn = deltaparentfn
self._builddeltaheader = builddeltaheader
self._manifestsend = manifestsend
self._ellipses = ellipses
# Set of capabilities we can use to build the bundle.
if bundlecaps is None:
bundlecaps = set()
self._bundlecaps = bundlecaps
self._isshallow = shallow
self._fullclnodes = fullnodes
# Maps ellipsis revs to their roots at the changelog level.
self._precomputedellipsis = ellipsisroots
# experimental config: bundle.reorder
reorder = repo.ui.config('bundle', 'reorder')
if reorder == 'auto':
self._reorder = allowreorder
else:
self._reorder = stringutil.parsebool(reorder)
self._repo = repo
if self._repo.ui.verbose and not self._repo.ui.debugflag:
self._verbosenote = self._repo.ui.note
else:
self._verbosenote = lambda s: None
def group(self, repo, revs, store, ischangelog, lookup, deltaparentfn,
deltaheaderfn, units=None, deltaheaderfn, units=None,
ellipses=False, clrevtolocalrev=None, fullclnodes=None, ellipses=False, clrevtolocalrev=None, fullclnodes=None,
precomputedellipsis=None): precomputedellipsis=None):
"""Calculate a delta group, yielding a sequence of changegroup chunks """Calculate a delta group, yielding a sequence of changegroup chunks
(strings). (strings).
durin42Unsubmitted
Done

nit: bytes

(follow-up please, to avoid turnaround time issues)

durin42: nit: bytes (follow-up please, to avoid turnaround time issues)
indygregAuthorUnsubmitted
Not Done

I rewrite the docstring later in the series. I was trying to optimize for review by not changing anything as part of the code move :)

indygreg: I rewrite the docstring later in the series. I was trying to optimize for review by not…
Given a list of changeset revs, return a set of deltas and Given a list of changeset revs, return a set of deltas and
metadata corresponding to nodes. The first delta is metadata corresponding to nodes. The first delta is
first parent(nodelist[0]) -> nodelist[0], the receiver is first parent(nodelist[0]) -> nodelist[0], the receiver is
guaranteed to have this parent as it has all history before guaranteed to have this parent as it has all history before
these changesets. In the case firstparent is nullrev the these changesets. In the case firstparent is nullrev the
changegroup starts with a full revision. changegroup starts with a full revision.
If units is not None, progress detail will be generated, units specifies If units is not None, progress detail will be generated, units specifies
the type of revlog that is touched (changelog, manifest, etc.). the type of revlog that is touched (changelog, manifest, etc.).
""" """
# if we don't have any revisions touched by these changesets, bail # if we don't have any revisions touched by these changesets, bail
if len(revs) == 0: if len(revs) == 0:
yield closechunk() yield closechunk()
return return
cl = repo.changelog cl = repo.changelog
# add the parent of the first rev # add the parent of the first rev
p = store.parentrevs(revs[0])[0] p = store.parentrevs(revs[0])[0]
revs.insert(0, p) revs.insert(0, p)
# build deltas # build deltas
progress = None progress = None
if units is not None: if units is not None:
progress = repo.ui.makeprogress(_('bundling'), unit=units, progress = repo.ui.makeprogress(_('bundling'), unit=units,
total=(len(revs) - 1)) total=(len(revs) - 1))
for r in pycompat.xrange(len(revs) - 1): for r in pycompat.xrange(len(revs) - 1):
if progress: if progress:
progress.update(r + 1) progress.update(r + 1)
prev, curr = revs[r], revs[r + 1] prev, curr = revs[r], revs[r + 1]
linknode = lookup(store.node(curr)) linknode = lookup(store.node(curr))
if ellipses: if ellipses:
linkrev = cl.rev(linknode) linkrev = cl.rev(linknode)
clrevtolocalrev[linkrev] = curr clrevtolocalrev[linkrev] = curr
# This is a node to send in full, because the changeset it # This is a node to send in full, because the changeset it
# corresponds to was a full changeset. # corresponds to was a full changeset.
if linknode in fullclnodes: if linknode in fullclnodes:
delta = _revisiondeltanormal(store, curr, prev, linknode, delta = _revisiondeltanormal(store, curr, prev, linknode,
deltaparentfn) deltaparentfn)
elif linkrev not in precomputedellipsis: elif linkrev not in precomputedellipsis:
delta = None delta = None
else: else:
delta = _revisiondeltanarrow( delta = _revisiondeltanarrow(
cl, store, ischangelog, curr, linkrev, linknode, cl, store, ischangelog, curr, linkrev, linknode,
clrevtolocalrev, fullclnodes, clrevtolocalrev, fullclnodes,
precomputedellipsis) precomputedellipsis)
else: else:
delta = _revisiondeltanormal(store, curr, prev, linknode, delta = _revisiondeltanormal(store, curr, prev, linknode,
deltaparentfn) deltaparentfn)
if not delta: if not delta:
continue continue
meta = deltaheaderfn(delta) meta = deltaheaderfn(delta)
l = len(meta) + sum(len(x) for x in delta.deltachunks) l = len(meta) + sum(len(x) for x in delta.deltachunks)
yield chunkheader(l) yield chunkheader(l)
yield meta yield meta
for x in delta.deltachunks: for x in delta.deltachunks:
yield x yield x
if progress: if progress:
progress.complete() progress.complete()
yield closechunk() yield closechunk()
class cgpacker(object):
def __init__(self, repo, filematcher, version, allowreorder,
deltaparentfn, builddeltaheader, manifestsend,
bundlecaps=None, ellipses=False,
shallow=False, ellipsisroots=None, fullnodes=None):
"""Given a source repo, construct a bundler.
filematcher is a matcher that matches on files to include in the
changegroup. Used to facilitate sparse changegroups.
allowreorder controls whether reordering of revisions is allowed.
This value is used when ``bundle.reorder`` is ``auto`` or isn't
set.
deltaparentfn is a callable that resolves the delta parent for
a specific revision.
builddeltaheader is a callable that constructs the header for a group
delta.
manifestsend is a chunk to send after manifests have been fully emitted.
ellipses indicates whether ellipsis serving mode is enabled.
bundlecaps is optional and can be used to specify the set of
capabilities which can be used to build the bundle. While bundlecaps is
unused in core Mercurial, extensions rely on this feature to communicate
capabilities to customize the changegroup packer.
shallow indicates whether shallow data might be sent. The packer may
need to pack file contents not introduced by the changes being packed.
fullnodes is the set of changelog nodes which should not be ellipsis
nodes. We store this rather than the set of nodes that should be
ellipsis because for very large histories we expect this to be
significantly smaller.
"""
assert filematcher
self._filematcher = filematcher
self.version = version
self._deltaparentfn = deltaparentfn
self._builddeltaheader = builddeltaheader
self._manifestsend = manifestsend
self._ellipses = ellipses
# Set of capabilities we can use to build the bundle.
if bundlecaps is None:
bundlecaps = set()
self._bundlecaps = bundlecaps
self._isshallow = shallow
self._fullclnodes = fullnodes
# Maps ellipsis revs to their roots at the changelog level.
self._precomputedellipsis = ellipsisroots
# experimental config: bundle.reorder
reorder = repo.ui.config('bundle', 'reorder')
if reorder == 'auto':
self._reorder = allowreorder
else:
self._reorder = stringutil.parsebool(reorder)
self._repo = repo
if self._repo.ui.verbose and not self._repo.ui.debugflag:
self._verbosenote = self._repo.ui.note
else:
self._verbosenote = lambda s: None
def generate(self, commonrevs, clnodes, fastpathlinkrev, source): def generate(self, commonrevs, clnodes, fastpathlinkrev, source):
"""Yield a sequence of changegroup byte chunks.""" """Yield a sequence of changegroup byte chunks."""
repo = self._repo repo = self._repo
cl = repo.changelog cl = repo.changelog
self._verbosenote(_('uncompressed size of bundle content:\n')) self._verbosenote(_('uncompressed size of bundle content:\n'))
size = 0 size = 0
state = { state = {
'clrevorder': clrevorder, 'clrevorder': clrevorder,
'mfs': mfs, 'mfs': mfs,
'changedfiles': changedfiles, 'changedfiles': changedfiles,
'clrevtomanifestrev': clrevtomanifestrev, 'clrevtomanifestrev': clrevtomanifestrev,
} }
gen = self.group(self._repo, revs, cl, True, lookupcl, gen = deltagroup(
self._repo, revs, cl, True, lookupcl,
self._deltaparentfn, self._builddeltaheader, self._deltaparentfn, self._builddeltaheader,
ellipses=self._ellipses, ellipses=self._ellipses,
units=_('changesets'), units=_('changesets'),
clrevtolocalrev={}, clrevtolocalrev={},
fullclnodes=self._fullclnodes, fullclnodes=self._fullclnodes,
precomputedellipsis=self._precomputedellipsis) precomputedellipsis=self._precomputedellipsis)
return state, gen return state, gen
def generatemanifests(self, commonrevs, clrevorder, fastpathlinkrev, mfs, def generatemanifests(self, commonrevs, clrevorder, fastpathlinkrev, mfs,
fnodes, source, clrevtolocalrev): fnodes, source, clrevtolocalrev):
"""Returns an iterator of changegroup chunks containing manifests. """Returns an iterator of changegroup chunks containing manifests.
`source` is unused here, but is used by extensions like remotefilelog to `source` is unused here, but is used by extensions like remotefilelog to
self._reorder) self._reorder)
if dir: if dir:
assert self.version == b'03' assert self.version == b'03'
chunk = _fileheader(dir) chunk = _fileheader(dir)
size += len(chunk) size += len(chunk)
yield chunk yield chunk
it = self.group( it = deltagroup(
self._repo, revs, store, False, lookupfn, self._repo, revs, store, False, lookupfn,
self._deltaparentfn, self._builddeltaheader, self._deltaparentfn, self._builddeltaheader,
ellipses=self._ellipses, ellipses=self._ellipses,
units=_('manifests'), units=_('manifests'),
clrevtolocalrev=clrevtolocalrev, clrevtolocalrev=clrevtolocalrev,
fullclnodes=self._fullclnodes, fullclnodes=self._fullclnodes,
precomputedellipsis=self._precomputedellipsis) precomputedellipsis=self._precomputedellipsis)
revs = _sortnodesnormal(filerevlog, filenodes, revs = _sortnodesnormal(filerevlog, filenodes,
self._reorder) self._reorder)
progress.update(i + 1, item=fname) progress.update(i + 1, item=fname)
h = _fileheader(fname) h = _fileheader(fname)
size = len(h) size = len(h)
yield h yield h
it = self.group( it = deltagroup(
self._repo, revs, filerevlog, False, lookupfilelog, self._repo, revs, filerevlog, False, lookupfilelog,
self._deltaparentfn, self._builddeltaheader, self._deltaparentfn, self._builddeltaheader,
ellipses=self._ellipses, ellipses=self._ellipses,
clrevtolocalrev=clrevtolocalrev, clrevtolocalrev=clrevtolocalrev,
fullclnodes=self._fullclnodes, fullclnodes=self._fullclnodes,
precomputedellipsis=self._precomputedellipsis) precomputedellipsis=self._precomputedellipsis)
for chunk in it: for chunk in it: