( )⚙ D4199 changegroup: inline _prune() into call sites

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4199

changegroup: inline _prune() into call sites
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG39f5c7afdc25: changegroup: inline _prune() into call sites
rHG2c123b0bcb7c: changegroup: inline _prune() into call sites
Summary

The functionality is pretty simple. As a bonus, _prune() had special
code for the manifest case. We can now exclude this check from the
file call site.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Aug 9 2018, 2:52 PM
Closed by commit rHG2c123b0bcb7c: changegroup: inline _prune() into call sites (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 (23 lines)

Diff 10166

mercurial/changegroup.py

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()
# filter any nodes that claim to be part of the known set
def _prune(self, store, missing, commonrevs):
# TODO this violates storage abstraction for manifests.
if isinstance(store, manifest.manifestrevlog):
if not self._filematcher.visitdir(store._dir[:-1] or '.'):
return []
rr, rl = store.rev, store.linkrev
return [n for n in missing if rl(rr(n)) not in commonrevs]
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
fclnodes[n] = clnode fclnodes[n] = clnode
return clnode return clnode
return lookupmflinknode return lookupmflinknode
size = 0 size = 0
while tmfnodes: while tmfnodes:
dir, nodes = tmfnodes.popitem() dir, nodes = tmfnodes.popitem()
store = dirlog(dir) store = dirlog(dir)
prunednodes = self._prune(store, nodes, commonrevs)
if not self._filematcher.visitdir(store._dir[:-1] or '.'):
prunednodes = []
else:
frev, flr = store.rev, store.linkrev
prunednodes = [n for n in nodes
if flr(frev(n)) not in commonrevs]
if dir and not prunednodes: if dir and not prunednodes:
continue continue
lookupfn = makelookupmflinknode(dir, nodes) lookupfn = makelookupmflinknode(dir, nodes)
if self._ellipses: if self._ellipses:
revs = _sortnodesellipsis(store, prunednodes, cl, revs = _sortnodesellipsis(store, prunednodes, cl,
clrevtolocalrev.clear() clrevtolocalrev.clear()
linkrevnodes = linknodes(filerevlog, fname) linkrevnodes = linknodes(filerevlog, fname)
# Lookup for filenodes, we collected the linkrev nodes above in the # Lookup for filenodes, we collected the linkrev nodes above in the
# fastpath case and with lookupmf in the slowpath case. # fastpath case and with lookupmf in the slowpath case.
def lookupfilelog(x): def lookupfilelog(x):
return linkrevnodes[x] return linkrevnodes[x]
filenodes = self._prune(filerevlog, linkrevnodes, commonrevs) frev, flr = filerevlog.rev, filerevlog.linkrev
filenodes = [n for n in linkrevnodes
if flr(frev(n)) not in commonrevs]
if filenodes: if filenodes:
if self._ellipses: if self._ellipses:
revs = _sortnodesellipsis(filerevlog, filenodes, revs = _sortnodesellipsis(filerevlog, filenodes,
cl, lookupfilelog) cl, lookupfilelog)
else: else:
revs = _sortnodesnormal(filerevlog, filenodes, revs = _sortnodesnormal(filerevlog, filenodes,
self._reorder) self._reorder)