This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4198

changegroup: inline _packmanifests() into generatemanifests()
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG5959ef78d834: changegroup: inline _packmanifests() into generatemanifests()
Summary

It is relatively small. Every other generate*() calls group()
directly. So the new code is consistent.

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, 2:52 PM
Closed by commit rHG5959ef78d834: changegroup: inline _packmanifests() into generatemanifests() (authored by indygreg). · Explain WhyAug 9 2018, 4:27 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changegroup.py (31 lines)

Diff 10187

mercurial/changegroup.py

# TODO this violates storage abstraction for manifests. # TODO this violates storage abstraction for manifests.
if isinstance(store, manifest.manifestrevlog): if isinstance(store, manifest.manifestrevlog):
if not self._filematcher.visitdir(store._dir[:-1] or '.'): if not self._filematcher.visitdir(store._dir[:-1] or '.'):
return [] return []
rr, rl = store.rev, store.linkrev rr, rl = store.rev, store.linkrev
return [n for n in missing if rl(rr(n)) not in commonrevs] return [n for n in missing if rl(rr(n)) not in commonrevs]
def _packmanifests(self, dir, dirlog, revs, lookuplinknode,
clrevtolocalrev):
"""Pack manifests into a changegroup stream.
Encodes the directory name in the output so multiple manifests
can be sent. Multiple manifests is not supported by cg1 and cg2.
"""
if dir:
assert self.version == b'03'
yield _fileheader(dir)
for chunk in self.group(revs, dirlog, False, lookuplinknode,
units=_('manifests'),
clrevtolocalrev=clrevtolocalrev):
yield chunk
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
if self._ellipses: if self._ellipses:
revs = _sortnodesellipsis(store, prunednodes, cl, revs = _sortnodesellipsis(store, prunednodes, cl,
lookupfn) lookupfn)
else: else:
revs = _sortnodesnormal(store, prunednodes, revs = _sortnodesnormal(store, prunednodes,
self._reorder) self._reorder)
for x in self._packmanifests(dir, store, revs, lookupfn, if dir:
clrevtolocalrev): assert self.version == b'03'
size += len(x) chunk = _fileheader(dir)
yield x size += len(chunk)
yield chunk
for chunk in self.group(revs, store, False, lookupfn,
units=_('manifests'),
clrevtolocalrev=clrevtolocalrev):
size += len(chunk)
yield chunk
self._verbosenote(_('%8.i (manifests)\n') % size) self._verbosenote(_('%8.i (manifests)\n') % size)
yield self._manifestsend yield self._manifestsend
# The 'source' parameter is useful for extensions # The 'source' parameter is useful for extensions
def generatefiles(self, changedfiles, commonrevs, source, def generatefiles(self, changedfiles, commonrevs, source,
mfdicts, fastpathlinkrev, fnodes, clrevs): mfdicts, fastpathlinkrev, fnodes, clrevs):
changedfiles = list(filter(self._filematcher, changedfiles)) changedfiles = list(filter(self._filematcher, changedfiles))