This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4012

changegroup: inline prune() logic from narrow
ClosedPublic

Authored by indygreg on Aug 1 2018, 1:03 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG5742d0428ed9: changegroup: inline prune() logic from narrow
Summary

prune() needs to ellide manifests that aren't part of the narrow
matcher.

The code is violating storage abstractions, so a comment has been
added. Keep in mind the impetus for moving this code to core
is so changegroup code can be refactored to be storage agnostic.

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 1 2018, 1:03 PM
martinvonz added a subscriber: martinvonz.Aug 2 2018, 12:59 PM

hg import is being annoying again, so can you rebase and update the remainder of the series?

indygreg updated this revision to Diff 9799.Aug 2 2018, 5:15 PM
Closed by commit rHG5742d0428ed9: changegroup: inline prune() logic from narrow (authored by indygreg). · Explain WhyAug 2 2018, 5:45 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 9808

hgext/narrow/narrowchangegroup.py

# narrowchangegroup.py - narrow clone changegroup creation and consumption # narrowchangegroup.py - narrow clone changegroup creation and consumption
# #
# Copyright 2017 Google, Inc. # Copyright 2017 Google, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
changegroup, changegroup,
error, error,
extensions, extensions,
manifest,
mdiff, mdiff,
node, node,
pycompat, pycompat,
revlog, revlog,
util, util,
) )
def setup(): def setup():
def prune(orig, self, revlog, missing, commonrevs):
if isinstance(revlog, manifest.manifestrevlog):
if not self._filematcher.visitdir(revlog._dir[:-1] or '.'):
return []
return orig(self, revlog, missing, commonrevs)
extensions.wrapfunction(changegroup.cg1packer, 'prune', prune)
def generatefiles(orig, self, changedfiles, linknodes, commonrevs, def generatefiles(orig, self, changedfiles, linknodes, commonrevs,
source): source):
changedfiles = list(filter(self._filematcher, changedfiles)) changedfiles = list(filter(self._filematcher, changedfiles))
if getattr(self, 'is_shallow', False): if getattr(self, 'is_shallow', False):
# See comment in generate() for why this sadness is a thing. # See comment in generate() for why this sadness is a thing.
mfdicts = self._mfdicts mfdicts = self._mfdicts
del self._mfdicts del self._mfdicts

mercurial/changegroup.py

hex, hex,
nullrev, nullrev,
short, short,
) )
from . import ( from . import (
dagutil, dagutil,
error, error,
manifest,
match as matchmod, match as matchmod,
mdiff, mdiff,
phases, phases,
pycompat, pycompat,
util, util,
) )
from .utils import ( from .utils import (
yield c yield c
if progress: if progress:
progress.complete() progress.complete()
yield self.close() yield self.close()
# filter any nodes that claim to be part of the known set # filter any nodes that claim to be part of the known set
def prune(self, revlog, missing, commonrevs): def prune(self, revlog, missing, commonrevs):
# TODO this violates storage abstraction for manifests.
if isinstance(revlog, manifest.manifestrevlog):
if not self._filematcher.visitdir(revlog._dir[:-1] or '.'):
return []
rr, rl = revlog.rev, revlog.linkrev rr, rl = revlog.rev, revlog.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, mfnodes, lookuplinknode): def _packmanifests(self, dir, mfnodes, lookuplinknode):
"""Pack flat manifests into a changegroup stream.""" """Pack flat manifests into a changegroup stream."""
assert not dir assert not dir
for chunk in self.group(mfnodes, self._repo.manifestlog._revlog, for chunk in self.group(mfnodes, self._repo.manifestlog._revlog,
lookuplinknode, units=_('manifests')): lookuplinknode, units=_('manifests')):