This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2201

narrowspec: move module into core
ClosedPublic

Authored by indygreg on Feb 12 2018, 7:31 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG9fd8c2a3db5a: narrowspec: move module into core
Summary

Having support for parsing the narrow specification in core is
necessary for moving many other parts of narrow to core.

We do still want to harmonize the narrow spec with the sparse
spec. And the format needs to be documented. But this shouldn't
hold up the code moving to core.

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.Feb 12 2018, 7:31 PM
durin42 accepted this revision.Feb 13 2018, 11:19 AM
This revision is now accepted and ready to land.Feb 13 2018, 11:19 AM
Closed by commit rHG9fd8c2a3db5a: narrowspec: move module into core (authored by indygreg). · Explain WhyFeb 13 2018, 12:27 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 5647

hgext/narrow/narrowbundle2.py

) )
from mercurial import ( from mercurial import (
bundle2, bundle2,
changegroup, changegroup,
dagutil, dagutil,
error, error,
exchange, exchange,
extensions, extensions,
narrowspec,
repair, repair,
util, util,
wireproto, wireproto,
) )
from . import ( from . import (
narrowrepo, narrowrepo,
narrowspec,
) )
NARROWCAP = 'narrow' NARROWCAP = 'narrow'
_NARROWACL_SECTION = 'narrowhgacl' _NARROWACL_SECTION = 'narrowhgacl'
_CHANGESPECPART = NARROWCAP + ':changespec' _CHANGESPECPART = NARROWCAP + ':changespec'
_SPECPART = NARROWCAP + ':spec' _SPECPART = NARROWCAP + ':spec'
_SPECPART_INCLUDE = 'include' _SPECPART_INCLUDE = 'include'
_SPECPART_EXCLUDE = 'exclude' _SPECPART_EXCLUDE = 'exclude'

hgext/narrow/narrowcommands.py

cmdutil, cmdutil,
commands, commands,
discovery, discovery,
error, error,
exchange, exchange,
extensions, extensions,
hg, hg,
merge, merge,
narrowspec,
node, node,
pycompat, pycompat,
registrar, registrar,
repair, repair,
repoview, repoview,
util, util,
) )
from . import ( from . import (
narrowbundle2, narrowbundle2,
narrowrepo, narrowrepo,
narrowspec,
) )
table = {} table = {}
command = registrar.command(table) command = registrar.command(table)
def setup(): def setup():
"""Wraps user-facing mercurial commands with narrow-aware versions.""" """Wraps user-facing mercurial commands with narrow-aware versions."""

hgext/narrow/narrowdirstate.py

# narrowdirstate.py - extensions to mercurial dirstate to support narrow clones # narrowdirstate.py - extensions to mercurial dirstate to support narrow clones
# #
# 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 (
dirstate, dirstate,
error, error,
extensions, extensions,
match as matchmod, match as matchmod,
narrowspec,
util as hgutil, util as hgutil,
) )
from . import narrowspec
def setup(repo): def setup(repo):
"""Add narrow spec dirstate ignore, block changes outside narrow spec.""" """Add narrow spec dirstate ignore, block changes outside narrow spec."""
def walk(orig, self, match, subrepos, unknown, ignored, full=True, def walk(orig, self, match, subrepos, unknown, ignored, full=True,
narrowonly=True): narrowonly=True):
if narrowonly: if narrowonly:
narrowmatch = repo.narrowmatch() narrowmatch = repo.narrowmatch()
match = matchmod.intersectmatchers(match, narrowmatch) match = matchmod.intersectmatchers(match, narrowmatch)

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,
hg, hg,
localrepo, localrepo,
match as matchmod, match as matchmod,
narrowspec,
scmutil, scmutil,
) )
from . import ( from . import (
narrowrevlog, narrowrevlog,
narrowspec,
) )
# When narrowing is finalized and no longer subject to format changes, # When narrowing is finalized and no longer subject to format changes,
# we should move this to just "narrow" or similar. # we should move this to just "narrow" or similar.
REQUIREMENT = 'narrowhg-experimental' REQUIREMENT = 'narrowhg-experimental'
def wrappostshare(orig, sourcerepo, destrepo, **kwargs): def wrappostshare(orig, sourcerepo, destrepo, **kwargs):
orig(sourcerepo, destrepo, **kwargs) orig(sourcerepo, destrepo, **kwargs)

hgext/narrow/narrowspec.py

  • This file was moved to mercurial/narrowspec.py.

hgext/narrow/narrowwirepeer.py

# narrowwirepeer.py - passes narrow spec with unbundle command # narrowwirepeer.py - passes narrow spec with unbundle command
# #
# 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 (
error, error,
extensions, extensions,
hg, hg,
narrowspec,
node, node,
) )
from . import narrowspec
def uisetup(): def uisetup():
def peersetup(ui, peer): def peersetup(ui, peer):
# We must set up the expansion before reposetup below, since it's used # We must set up the expansion before reposetup below, since it's used
# at clone time before we have a repo. # at clone time before we have a repo.
class expandingpeer(peer.__class__): class expandingpeer(peer.__class__):
def expandnarrow(self, narrow_include, narrow_exclude, nodes): def expandnarrow(self, narrow_include, narrow_exclude, nodes):
ui.status(_("expanding narrowspec\n")) ui.status(_("expanding narrowspec\n"))
if not self.capable('exp-expandnarrow'): if not self.capable('exp-expandnarrow'):

mercurial/narrowspec.py

  • This file was moved from hgext/narrow/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 mercurial.i18n import _ from .i18n import _
from mercurial import ( from . import (
error, error,
hg, hg,
match as matchmod, match as matchmod,
util, util,
) )
FILENAME = 'narrowspec' FILENAME = 'narrowspec'
Patterns are stored in the narrowspec as newline-separated Patterns are stored in the narrowspec as newline-separated
POSIX-style bytestring paths. There's no escaping. POSIX-style bytestring paths. There's no escaping.
""" """
# We use newlines as separators in the narrowspec file, so don't allow them # We use newlines as separators in the narrowspec file, so don't allow them
# in patterns. # in patterns.
if _numlines(pat) > 1: if _numlines(pat) > 1:
raise error.Abort('newlines are not allowed in narrowspec paths') raise error.Abort(_('newlines are not allowed in narrowspec paths'))
components = pat.split('/') components = pat.split('/')
if '.' in components or '..' in components: if '.' in components or '..' in components:
raise error.Abort(_('"." and ".." are not allowed in narrowspec paths')) raise error.Abort(_('"." and ".." are not allowed in narrowspec paths'))
def normalizepattern(pattern, defaultkind='path'): def normalizepattern(pattern, defaultkind='path'):
"""Returns the normalized version of a text-format pattern. """Returns the normalized version of a text-format pattern.

tests/test-narrow-expanddirstate.t

have this method available in narrowhg proper at the moment. have this method available in narrowhg proper at the moment.
$ cat > "$TESTTMP/expand_extension.py" <<EOF $ cat > "$TESTTMP/expand_extension.py" <<EOF
> import os > import os
> import sys > import sys
> >
> from mercurial import extensions > from mercurial import extensions
> from mercurial import localrepo > from mercurial import localrepo
> from mercurial import match as matchmod > from mercurial import match as matchmod
> from mercurial import narrowspec
> from mercurial import patch > from mercurial import patch
> from mercurial import util as hgutil > from mercurial import util as hgutil
> >
> def expandnarrowspec(ui, repo, newincludes=None): > def expandnarrowspec(ui, repo, newincludes=None):
> if not newincludes: > if not newincludes:
> return > return
> import sys > import sys
> newincludes = set([newincludes]) > newincludes = set([newincludes])
> narrowhg = extensions.find('narrow')
> includes, excludes = repo.narrowpats > includes, excludes = repo.narrowpats
> currentmatcher = narrowhg.narrowspec.match(repo.root, includes, excludes) > currentmatcher = narrowspec.match(repo.root, includes, excludes)
> includes = includes | newincludes > includes = includes | newincludes
> if not repo.currenttransaction(): > if not repo.currenttransaction():
> ui.develwarn('expandnarrowspec called outside of transaction!') > ui.develwarn('expandnarrowspec called outside of transaction!')
> repo.setnarrowpats(includes, excludes) > repo.setnarrowpats(includes, excludes)
> newmatcher = narrowhg.narrowspec.match(repo.root, includes, excludes) > newmatcher = narrowspec.match(repo.root, includes, excludes)
> added = matchmod.differencematcher(newmatcher, currentmatcher) > added = matchmod.differencematcher(newmatcher, currentmatcher)
> for f in repo['.'].manifest().walk(added): > for f in repo['.'].manifest().walk(added):
> repo.dirstate.normallookup(f) > repo.dirstate.normallookup(f)
> >
> def makeds(ui, repo): > def makeds(ui, repo):
> def wrapds(orig, self): > def wrapds(orig, self):
> ds = orig(self) > ds = orig(self)
> class expandingdirstate(ds.__class__): > class expandingdirstate(ds.__class__):