This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4209

changegroup: move manifest chunk emission to generate()
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc921ad9cae08: changegroup: move manifest chunk emission to generate()
Summary

We want to get to a point where we can emit data structures from
deltagroup() and derive the raw changegroup data as late as possible.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

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

nit: this shadows the dir() builtin, which makes me a bit uncomfortable - send a followup?

("tree" maybe?)

indygreg added inline comments.Aug 9 2018, 10:19 PM
mercurial/changegroup.py
879

This bothered me as well. I will happily submit a follow-up. Will tack it at the end of my current series.

Closed by commit rHGc921ad9cae08: changegroup: move manifest chunk emission to generate() (authored by indygreg). · Explain WhyAug 9 2018, 10:24 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changegroup.py (34 lines)

Diff 10203

mercurial/changegroup.py

# either, because we don't discover which directory nodes to # either, because we don't discover which directory nodes to
# send along with files. This could probably be fixed. # send along with files. This could probably be fixed.
fastpathlinkrev = fastpathlinkrev and ( fastpathlinkrev = fastpathlinkrev and (
'treemanifest' not in repo.requirements) 'treemanifest' not in repo.requirements)
fnodes = {} # needed file nodes fnodes = {} # needed file nodes
size = 0 size = 0
for chunk in self.generatemanifests(commonrevs, clrevorder, it = self.generatemanifests(
fastpathlinkrev, mfs, fnodes, source, commonrevs, clrevorder, fastpathlinkrev, mfs, fnodes, source,
clstate['clrevtomanifestrev']): clstate['clrevtomanifestrev'])
for dir, chunks in it:
durin42Unsubmitted
Not Done

nit: this shadows the dir() builtin, which makes me a bit uncomfortable - send a followup?

("tree" maybe?)

durin42: nit: this shadows the dir() builtin, which makes me a bit uncomfortable - send a followup?
indygregAuthorUnsubmitted
Not Done

This bothered me as well. I will happily submit a follow-up. Will tack it at the end of my current series.

indygreg: This bothered me as well. I will happily submit a follow-up. Will tack it at the end of my…
if dir:
assert self.version == b'03'
chunk = _fileheader(dir)
size += len(chunk) size += len(chunk)
yield chunk yield chunk
for chunk in chunks:
size += len(chunk)
yield chunk
close = closechunk()
size += len(close)
yield close
self._verbosenote(_('%8.i (manifests)\n') % size) self._verbosenote(_('%8.i (manifests)\n') % size)
yield self._manifestsend yield self._manifestsend
mfdicts = None mfdicts = None
if self._ellipses and self._isshallow: if self._ellipses and self._isshallow:
mfdicts = [(self._repo.manifestlog[n].read(), lr) mfdicts = [(self._repo.manifestlog[n].read(), lr)
for (n, lr) in mfs.iteritems()] for (n, lr) in mfs.iteritems()]
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)
if dir:
assert self.version == b'03'
chunk = _fileheader(dir)
yield chunk
it = deltagroup( 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)
for chunk in it: yield dir, it
yield chunk
close = closechunk()
yield close
# 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))
if not fastpathlinkrev: if not fastpathlinkrev:
def normallinknodes(unused, fname): def normallinknodes(unused, fname):