This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4685

changegroup: tease out a temporary prune method for manifests
ClosedPublic

Authored by durin42 on Sep 20 2018, 3:39 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe03c1a63155c: changegroup: tease out a temporary prune method for manifests
Summary

It's extracted so extensions can filter manifest nodes if needed. This
is an unfortunate hack, but I think I only need it for manifests. The
long-term solution will be to rework the relationship between
changegroups and storage so that this isn't required.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/changegroup.py (15 lines)

Diff 11225

mercurial/changegroup.py

while tmfnodes: while tmfnodes:
tree, nodes = tmfnodes.popitem() tree, nodes = tmfnodes.popitem()
store = mfl.getstorage(tree) store = mfl.getstorage(tree)
if not self._filematcher.visitdir(store.tree[:-1] or '.'): if not self._filematcher.visitdir(store.tree[:-1] or '.'):
prunednodes = [] prunednodes = []
else: else:
frev, flr = store.rev, store.linkrev prunednodes = self._prunemanifests(store, nodes, commonrevs)
prunednodes = [n for n in nodes
if flr(frev(n)) not in commonrevs]
if tree and not prunednodes: if tree and not prunednodes:
continue continue
lookupfn = makelookupmflinknode(tree, nodes) lookupfn = makelookupmflinknode(tree, nodes)
deltas = deltagroup( deltas = deltagroup(
self._repo, store, prunednodes, False, lookupfn, self._repo, store, prunednodes, False, lookupfn,
self._forcedeltaparentprev, self._reorder, self._forcedeltaparentprev, self._reorder,
ellipses=self._ellipses, ellipses=self._ellipses,
topic=_('manifests'), topic=_('manifests'),
clrevtolocalrev=clrevtolocalrev, clrevtolocalrev=clrevtolocalrev,
fullclnodes=self._fullclnodes, fullclnodes=self._fullclnodes,
precomputedellipsis=self._precomputedellipsis) precomputedellipsis=self._precomputedellipsis)
yield tree, deltas yield tree, deltas
def _prunemanifests(self, store, nodes, commonrevs):
# This is split out as a separate method to allow filtering
# commonrevs in extension code.
#
# TODO(augie): this shouldn't be required, instead we should
# make filtering of revisions to send delegated to the store
# layer.
frev, flr = store.rev, store.linkrev
return [n for n in nodes if flr(frev(n)) not in commonrevs]
# 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, {})