This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4208

changegroup: move size tracking and end of manifests to generate()
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG2ebdd265fe8c: changegroup: move size tracking and end of manifests to generate()
Summary

Preparing for all the generate* functions to emit data structures
instead of raw chunks.

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

PathPackages
Mmercurial/changegroup.py (12 lines)

Diff 10232

mercurial/changegroup.py

# Treemanifests don't work correctly with fastpathlinkrev # Treemanifests don't work correctly with fastpathlinkrev
# 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
for chunk in self.generatemanifests(commonrevs, clrevorder, for chunk in self.generatemanifests(commonrevs, clrevorder,
fastpathlinkrev, mfs, fnodes, source, fastpathlinkrev, mfs, fnodes, source,
clstate['clrevtomanifestrev']): clstate['clrevtomanifestrev']):
size += len(chunk)
yield chunk yield chunk
self._verbosenote(_('%8.i (manifests)\n') % size)
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()]
mfs.clear() mfs.clear()
clrevs = set(cl.rev(x) for x in clnodes) clrevs = set(cl.rev(x) for x in clnodes)
f = dir + p f = dir + p
fclnodes = fnodes.setdefault(f, {}) fclnodes = fnodes.setdefault(f, {})
fclnode = fclnodes.setdefault(n, clnode) fclnode = fclnodes.setdefault(n, clnode)
if clrevorder[clnode] < clrevorder[fclnode]: if clrevorder[clnode] < clrevorder[fclnode]:
fclnodes[n] = clnode fclnodes[n] = clnode
return clnode return clnode
return lookupmflinknode return lookupmflinknode
size = 0
while tmfnodes: while tmfnodes:
dir, nodes = tmfnodes.popitem() dir, nodes = tmfnodes.popitem()
store = dirlog(dir) store = dirlog(dir)
if not self._filematcher.visitdir(store._dir[:-1] or '.'): if not self._filematcher.visitdir(store._dir[:-1] or '.'):
prunednodes = [] prunednodes = []
else: else:
frev, flr = store.rev, store.linkrev frev, flr = store.rev, store.linkrev
lookupfn) lookupfn)
else: else:
revs = _sortnodesnormal(store, prunednodes, revs = _sortnodesnormal(store, prunednodes,
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)
yield chunk 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: for chunk in it:
size += len(chunk)
yield chunk yield chunk
close = closechunk() close = closechunk()
size += len(close)
yield close yield close
self._verbosenote(_('%8.i (manifests)\n') % size)
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))
if not fastpathlinkrev: if not fastpathlinkrev:
def normallinknodes(unused, fname): def normallinknodes(unused, fname):
return fnodes.get(fname, {}) return fnodes.get(fname, {})