This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2494

narrow: move narrowmatch-related methods to localrepo
ClosedPublic

Authored by martinvonz on Feb 28 2018, 3:56 PM.

Details

Reviewers
durin42
indygreg
Group Reviewers
hg-reviewers
Commits
rHGc28b6d609c47: narrow: move narrowmatch-related methods to localrepo
rHG759a79ce785e: narrow: move narrowmatch-related methods to localrepo
Summary

This patch makes it so localrepo.narrowmatch() and a few more are
always available, which will let us simplify the use sites a
bit. narrowmatch() will return an always-matcher in non-narrow repos
(just like it did when it lived in the narrow extension).

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Feb 28 2018, 3:56 PM
indygreg accepted this revision.Feb 28 2018, 9:13 PM
indygreg added a subscriber: indygreg.

I know we're trying to remove methods from localrepository so it is smaller. narrowpats and _narrowmatch need to be there because of @repofilecache. And narrowmatch is the thing we want to add to localrepository. I suppose setnarrowpats could live outside the class. But we don't have a better place in core yet. So I'm going to call it scope bloat and something that can be deferred to a follow-up patch, if desired.

This revision is now accepted and ready to land.Feb 28 2018, 9:13 PM
Closed by commit rHG759a79ce785e: narrow: move narrowmatch-related methods to localrepo (authored by martinvonz). · Explain WhyFeb 28 2018, 9:18 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/narrow/narrowrepo.py (30 lines)
Mmercurial/localrepo.py (32 lines)

Diff 6194

hgext/narrow/narrowrepo.py

# narrowrepo.py - repository which supports narrow revlogs, lazy loading # narrowrepo.py - repository which supports narrow revlogs, lazy loading
# #
# 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 import ( from mercurial import (
bundlerepo, bundlerepo,
changegroup, changegroup,
hg, hg,
localrepo, localrepo,
match as matchmod,
narrowspec, narrowspec,
scmutil, scmutil,
) )
from . import ( from . import (
narrowrevlog, narrowrevlog,
) )
narrowrevlog.makenarrowmanifestlog(mfl, self) narrowrevlog.makenarrowmanifestlog(mfl, self)
return mfl return mfl
def file(self, f): def file(self, f):
fl = super(narrowrepository, self).file(f) fl = super(narrowrepository, self).file(f)
narrowrevlog.makenarrowfilelog(fl, self.narrowmatch()) narrowrevlog.makenarrowfilelog(fl, self.narrowmatch())
return fl return fl
@localrepo.repofilecache(narrowspec.FILENAME)
def narrowpats(self):
"""matcher patterns for this repository's narrowspec
A tuple of (includes, excludes).
"""
source = self
if self.shared():
source = hg.sharedreposource(self)
return narrowspec.load(source)
@localrepo.repofilecache(narrowspec.FILENAME)
def _narrowmatch(self):
if changegroup.NARROW_REQUIREMENT not in self.requirements:
return matchmod.always(self.root, '')
include, exclude = self.narrowpats
return narrowspec.match(self.root, include=include, exclude=exclude)
# TODO(martinvonz): make this property-like instead?
def narrowmatch(self):
return self._narrowmatch
def setnarrowpats(self, newincludes, newexcludes):
target = self
if self.shared():
target = hg.sharedreposource(self)
narrowspec.save(target, newincludes, newexcludes)
self.invalidate(clearfilecache=True)
# I'm not sure this is the right place to do this filter. # I'm not sure this is the right place to do this filter.
# context._manifestmatches() would probably be better, or perhaps # context._manifestmatches() would probably be better, or perhaps
# move it to a later place, in case some of the callers do want to know # move it to a later place, in case some of the callers do want to know
# which directories changed. This seems to work for now, though. # which directories changed. This seems to work for now, though.
def status(self, *args, **kwargs): def status(self, *args, **kwargs):
s = super(narrowrepository, self).status(*args, **kwargs) s = super(narrowrepository, self).status(*args, **kwargs)
narrowmatch = self.narrowmatch() narrowmatch = self.narrowmatch()
modified = list(filter(narrowmatch, s.modified)) modified = list(filter(narrowmatch, s.modified))

mercurial/localrepo.py

filelog, filelog,
hook, hook,
lock as lockmod, lock as lockmod,
manifest, manifest,
match as matchmod, match as matchmod,
merge as mergemod, merge as mergemod,
mergeutil, mergeutil,
namespaces, namespaces,
narrowspec,
obsolete, obsolete,
pathutil, pathutil,
peer, peer,
phases, phases,
pushkey, pushkey,
pycompat, pycompat,
repository, repository,
repoview, repoview,
return node return node
except error.LookupError: except error.LookupError:
if not self._dirstatevalidatewarned: if not self._dirstatevalidatewarned:
self._dirstatevalidatewarned = True self._dirstatevalidatewarned = True
self.ui.warn(_("warning: ignoring unknown" self.ui.warn(_("warning: ignoring unknown"
" working parent %s!\n") % short(node)) " working parent %s!\n") % short(node))
return nullid return nullid
@repofilecache(narrowspec.FILENAME)
def narrowpats(self):
"""matcher patterns for this repository's narrowspec
A tuple of (includes, excludes).
"""
source = self
if self.shared():
from . import hg
source = hg.sharedreposource(self)
return narrowspec.load(source)
@repofilecache(narrowspec.FILENAME)
def _narrowmatch(self):
if changegroup.NARROW_REQUIREMENT not in self.requirements:
return matchmod.always(self.root, '')
include, exclude = self.narrowpats
return narrowspec.match(self.root, include=include, exclude=exclude)
# TODO(martinvonz): make this property-like instead?
def narrowmatch(self):
return self._narrowmatch
def setnarrowpats(self, newincludes, newexcludes):
target = self
if self.shared():
from . import hg
target = hg.sharedreposource(self)
narrowspec.save(target, newincludes, newexcludes)
self.invalidate(clearfilecache=True)
def __getitem__(self, changeid): def __getitem__(self, changeid):
if changeid is None: if changeid is None:
return context.workingctx(self) return context.workingctx(self)
if isinstance(changeid, slice): if isinstance(changeid, slice):
# wdirrev isn't contiguous so the slice shouldn't include it # wdirrev isn't contiguous so the slice shouldn't include it
return [context.changectx(self, i) return [context.changectx(self, i)
for i in xrange(*changeid.indices(len(self))) for i in xrange(*changeid.indices(len(self)))
if i not in self.changelog.filteredrevs] if i not in self.changelog.filteredrevs]