This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2493

narrow: remove dependency from narrowspec module to hg module
ClosedPublic

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

Details

Reviewers
durin42
indygreg
Group Reviewers
hg-reviewers
Commits
rHGd851951b421c: narrow: remove dependency from narrowspec module to hg module
rHG0abed045d325: narrow: remove dependency from narrowspec module to hg module
Summary

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

martinvonz created this revision.Feb 28 2018, 3:56 PM
indygreg accepted this revision.Feb 28 2018, 9:09 PM
indygreg added a subscriber: indygreg.
indygreg added inline comments.
hgext/narrow/narrowrepo.py
76–80

It feels like there could be a helper method that returns the repo object backing the store. But that's for another patch.

This revision is now accepted and ready to land.Feb 28 2018, 9:09 PM
Closed by commit rHG0abed045d325: narrow: remove dependency from narrowspec module to hg module (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 (10 lines)
Mmercurial/narrowspec.py (5 lines)

Diff 6226

hgext/narrow/narrowrepo.py

return fl return fl
@localrepo.repofilecache(narrowspec.FILENAME) @localrepo.repofilecache(narrowspec.FILENAME)
def narrowpats(self): def narrowpats(self):
"""matcher patterns for this repository's narrowspec """matcher patterns for this repository's narrowspec
A tuple of (includes, excludes). A tuple of (includes, excludes).
""" """
return narrowspec.load(self) source = self
if self.shared():
source = hg.sharedreposource(self)
return narrowspec.load(source)
indygregUnsubmitted
Not Done

It feels like there could be a helper method that returns the repo object backing the store. But that's for another patch.

indygreg: It feels like there could be a helper method that returns the repo object backing the store.
@localrepo.repofilecache(narrowspec.FILENAME) @localrepo.repofilecache(narrowspec.FILENAME)
def _narrowmatch(self): def _narrowmatch(self):
if changegroup.NARROW_REQUIREMENT not in self.requirements: if changegroup.NARROW_REQUIREMENT not in self.requirements:
return matchmod.always(self.root, '') return matchmod.always(self.root, '')
include, exclude = self.narrowpats include, exclude = self.narrowpats
return narrowspec.match(self.root, include=include, exclude=exclude) return narrowspec.match(self.root, include=include, exclude=exclude)
# TODO(martinvonz): make this property-like instead? # TODO(martinvonz): make this property-like instead?
def narrowmatch(self): def narrowmatch(self):
return self._narrowmatch return self._narrowmatch
def setnarrowpats(self, newincludes, newexcludes): def setnarrowpats(self, newincludes, newexcludes):
narrowspec.save(self, newincludes, newexcludes) target = self
if self.shared():
target = hg.sharedreposource(self)
narrowspec.save(target, newincludes, newexcludes)
self.invalidate(clearfilecache=True) 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)

mercurial/narrowspec.py

# narrowspec.py - methods for working with a narrow view of a repository # narrowspec.py - methods for working with a narrow view of a repository
# #
# 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
import errno import errno
from .i18n import _ from .i18n import _
from . import ( from . import (
error, error,
hg,
match as matchmod, match as matchmod,
util, util,
) )
FILENAME = 'narrowspec' FILENAME = 'narrowspec'
def _parsestoredpatterns(text): def _parsestoredpatterns(text):
"""Parses the narrowspec format that's stored on disk.""" """Parses the narrowspec format that's stored on disk."""
return matchmod.never(root, '') return matchmod.never(root, '')
return matchmod.match(root, '', [], include=include or [], return matchmod.match(root, '', [], include=include or [],
exclude=exclude or []) exclude=exclude or [])
def needsexpansion(includes): def needsexpansion(includes):
return [i for i in includes if i.startswith('include:')] return [i for i in includes if i.startswith('include:')]
def load(repo): def load(repo):
if repo.shared():
repo = hg.sharedreposource(repo)
try: try:
spec = repo.vfs.read(FILENAME) spec = repo.vfs.read(FILENAME)
except IOError as e: except IOError as e:
# Treat "narrowspec does not exist" the same as "narrowspec file exists # Treat "narrowspec does not exist" the same as "narrowspec file exists
# and is empty". # and is empty".
if e.errno == errno.ENOENT: if e.errno == errno.ENOENT:
# Without this the next call to load will use the cached # Without this the next call to load will use the cached
# non-existence of the file, which can cause some odd issues. # non-existence of the file, which can cause some odd issues.
repo.invalidate(clearfilecache=True) repo.invalidate(clearfilecache=True)
return set(), set() return set(), set()
raise raise
return _parsestoredpatterns(spec) return _parsestoredpatterns(spec)
def save(repo, includepats, excludepats): def save(repo, includepats, excludepats):
spec = format(includepats, excludepats) spec = format(includepats, excludepats)
if repo.shared():
repo = hg.sharedreposource(repo)
repo.vfs.write(FILENAME, spec) repo.vfs.write(FILENAME, spec)
def restrictpatterns(req_includes, req_excludes, repo_includes, repo_excludes): def restrictpatterns(req_includes, req_excludes, repo_includes, repo_excludes):
r""" Restricts the patterns according to repo settings, r""" Restricts the patterns according to repo settings,
results in a logical AND operation results in a logical AND operation
:param req_includes: requested includes :param req_includes: requested includes
:param req_excludes: requested excludes :param req_excludes: requested excludes