This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2487

narrow: move requirement constant to core
ClosedPublic

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

Details

Reviewers
durin42
indygreg
Group Reviewers
hg-reviewers
Commits
rHG3f0af89e008d: narrow: move requirement constant to core
rHGd93553662d0a: narrow: move requirement constant to core
Summary

My short-term goal is to move narrowrepo.narrowmatch() onto localrepo
and this is a necessary step for that.

I put the constant in changegroup.py, unlike REVLOGV2_REQUIREMENT,
which is in localrepo.py, since we'll need to access it from the
changegroup module eventually.

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:02 PM
indygreg added a subscriber: indygreg.

I could bikeshed the location. But meh. Anywhere in core is better than nowhere in core.

(I would have suggested repository.py)

This revision is now accepted and ready to land.Feb 28 2018, 9:02 PM
Closed by commit rHGd93553662d0a: narrow: move requirement constant to core (authored by martinvonz). · Explain WhyFeb 28 2018, 9:17 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 6220

hgext/narrow/__init__.py

# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or # be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified. # leave the attribute unspecified.
testedwith = 'ships-with-hg-core' testedwith = 'ships-with-hg-core'
from mercurial import ( from mercurial import (
changegroup,
extensions, extensions,
hg, hg,
localrepo, localrepo,
registrar, registrar,
verify as verifymod, verify as verifymod,
) )
from . import ( from . import (
configitem('experimental', 'narrowservebrokenellipses', configitem('experimental', 'narrowservebrokenellipses',
default=False, default=False,
alias=[('narrow', 'serveellipses')], alias=[('narrow', 'serveellipses')],
) )
# Export the commands table for Mercurial to see. # Export the commands table for Mercurial to see.
cmdtable = narrowcommands.table cmdtable = narrowcommands.table
localrepo.localrepository._basesupported.add(narrowrepo.REQUIREMENT) localrepo.localrepository._basesupported.add(changegroup.NARROW_REQUIREMENT)
def uisetup(ui): def uisetup(ui):
"""Wraps user-facing mercurial commands with narrow-aware versions.""" """Wraps user-facing mercurial commands with narrow-aware versions."""
narrowrevlog.setup() narrowrevlog.setup()
narrowbundle2.setup() narrowbundle2.setup()
narrowmerge.setup() narrowmerge.setup()
narrowcommands.setup() narrowcommands.setup()
narrowchangegroup.setup() narrowchangegroup.setup()
narrowwirepeer.uisetup() narrowwirepeer.uisetup()
def reposetup(ui, repo): def reposetup(ui, repo):
"""Wraps local repositories with narrow repo support.""" """Wraps local repositories with narrow repo support."""
if not isinstance(repo, localrepo.localrepository): if not isinstance(repo, localrepo.localrepository):
return return
if narrowrepo.REQUIREMENT in repo.requirements: if changegroup.NARROW_REQUIREMENT in repo.requirements:
narrowrepo.wraprepo(repo, True) narrowrepo.wraprepo(repo, True)
narrowcopies.setup(repo) narrowcopies.setup(repo)
narrowdirstate.setup(repo) narrowdirstate.setup(repo)
narrowpatch.setup(repo) narrowpatch.setup(repo)
narrowwirepeer.reposetup(repo) narrowwirepeer.reposetup(repo)
def _verifierinit(orig, self, repo, matcher=None): def _verifierinit(orig, self, repo, matcher=None):
# The verifier's matcher argument was desgined for narrowhg, so it should # The verifier's matcher argument was desgined for narrowhg, so it should

hgext/narrow/narrowbundle2.py

exchange, exchange,
extensions, extensions,
narrowspec, narrowspec,
repair, repair,
util, util,
wireproto, wireproto,
) )
from . import (
narrowrepo,
)
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'
_KILLNODESIGNAL = 'KILL' _KILLNODESIGNAL = 'KILL'
_DONESIGNAL = 'DONE' _DONESIGNAL = 'DONE'
new_args['excludepats'] = req_excludes new_args['excludepats'] = req_excludes
return new_args return new_args
@bundle2.parthandler(_SPECPART, (_SPECPART_INCLUDE, _SPECPART_EXCLUDE)) @bundle2.parthandler(_SPECPART, (_SPECPART_INCLUDE, _SPECPART_EXCLUDE))
def _handlechangespec_2(op, inpart): def _handlechangespec_2(op, inpart):
includepats = set(inpart.params.get(_SPECPART_INCLUDE, '').splitlines()) includepats = set(inpart.params.get(_SPECPART_INCLUDE, '').splitlines())
excludepats = set(inpart.params.get(_SPECPART_EXCLUDE, '').splitlines()) excludepats = set(inpart.params.get(_SPECPART_EXCLUDE, '').splitlines())
narrowspec.save(op.repo, includepats, excludepats) narrowspec.save(op.repo, includepats, excludepats)
if not narrowrepo.REQUIREMENT in op.repo.requirements: if not changegroup.NARROW_REQUIREMENT in op.repo.requirements:
op.repo.requirements.add(narrowrepo.REQUIREMENT) op.repo.requirements.add(changegroup.NARROW_REQUIREMENT)
op.repo._writerequirements() op.repo._writerequirements()
op.repo.invalidate(clearfilecache=True) op.repo.invalidate(clearfilecache=True)
@bundle2.parthandler(_CHANGESPECPART) @bundle2.parthandler(_CHANGESPECPART)
def _handlechangespec(op, inpart): def _handlechangespec(op, inpart):
repo = op.repo repo = op.repo
cl = repo.changelog cl = repo.changelog

hgext/narrow/narrowchangegroup.py

extensions, extensions,
manifest, manifest,
mdiff, mdiff,
node, node,
revlog, revlog,
util, util,
) )
from . import (
narrowrepo,
)
def setup(): def setup():
def supportedoutgoingversions(orig, repo): def supportedoutgoingversions(orig, repo):
versions = orig(repo) versions = orig(repo)
if narrowrepo.REQUIREMENT in repo.requirements: if changegroup.NARROW_REQUIREMENT in repo.requirements:
versions.discard('01') versions.discard('01')
versions.discard('02') versions.discard('02')
return versions return versions
extensions.wrapfunction(changegroup, 'supportedoutgoingversions', extensions.wrapfunction(changegroup, 'supportedoutgoingversions',
supportedoutgoingversions) supportedoutgoingversions)
def prune(orig, self, revlog, missing, commonrevs): def prune(orig, self, revlog, missing, commonrevs):

hgext/narrow/narrowcommands.py

# narrowcommands.py - command modifications for narrowhg extension # narrowcommands.py - command modifications for narrowhg extension
# #
# 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 itertools import itertools
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
cmdutil, cmdutil,
changegroup,
commands, commands,
discovery, discovery,
error, error,
exchange, exchange,
extensions, extensions,
hg, hg,
merge, merge,
narrowspec, narrowspec,
'_pullbundle2extraprepare', pullbundle2extraprepare_widen) '_pullbundle2extraprepare', pullbundle2extraprepare_widen)
def pullnarrow(orig, repo, *args, **kwargs): def pullnarrow(orig, repo, *args, **kwargs):
narrowrepo.wraprepo(repo.unfiltered(), opts_narrow) narrowrepo.wraprepo(repo.unfiltered(), opts_narrow)
if isinstance(repo, repoview.repoview): if isinstance(repo, repoview.repoview):
repo.__class__.__bases__ = (repo.__class__.__bases__[0], repo.__class__.__bases__ = (repo.__class__.__bases__[0],
repo.unfiltered().__class__) repo.unfiltered().__class__)
if opts_narrow: if opts_narrow:
repo.requirements.add(narrowrepo.REQUIREMENT) repo.requirements.add(changegroup.NARROW_REQUIREMENT)
repo._writerequirements() repo._writerequirements()
return orig(repo, *args, **kwargs) return orig(repo, *args, **kwargs)
wrappedpull = extensions.wrappedfunction(exchange, 'pull', pullnarrow) wrappedpull = extensions.wrappedfunction(exchange, 'pull', pullnarrow)
with wrappedextraprepare, wrappedpull: with wrappedextraprepare, wrappedpull:
return orig(ui, repo, *args, **pycompat.strkwargs(opts)) return orig(ui, repo, *args, **pycompat.strkwargs(opts))
def pullnarrowcmd(orig, ui, repo, *args, **opts): def pullnarrowcmd(orig, ui, repo, *args, **opts):
"""Wraps pull command to allow modifying narrow spec.""" """Wraps pull command to allow modifying narrow spec."""
wrappedextraprepare = util.nullcontextmanager() wrappedextraprepare = util.nullcontextmanager()
if narrowrepo.REQUIREMENT in repo.requirements: if changegroup.NARROW_REQUIREMENT in repo.requirements:
def pullbundle2extraprepare_widen(orig, pullop, kwargs): def pullbundle2extraprepare_widen(orig, pullop, kwargs):
orig(pullop, kwargs) orig(pullop, kwargs)
if opts.get(r'depth'): if opts.get(r'depth'):
kwargs['depth'] = opts[r'depth'] kwargs['depth'] = opts[r'depth']
wrappedextraprepare = extensions.wrappedfunction(exchange, wrappedextraprepare = extensions.wrappedfunction(exchange,
'_pullbundle2extraprepare', pullbundle2extraprepare_widen) '_pullbundle2extraprepare', pullbundle2extraprepare_widen)
with wrappedextraprepare: with wrappedextraprepare:
return orig(ui, repo, *args, **opts) return orig(ui, repo, *args, **opts)
def archivenarrowcmd(orig, ui, repo, *args, **opts): def archivenarrowcmd(orig, ui, repo, *args, **opts):
"""Wraps archive command to narrow the default includes.""" """Wraps archive command to narrow the default includes."""
if narrowrepo.REQUIREMENT in repo.requirements: if changegroup.NARROW_REQUIREMENT in repo.requirements:
repo_includes, repo_excludes = repo.narrowpats repo_includes, repo_excludes = repo.narrowpats
includes = set(opts.get(r'include', [])) includes = set(opts.get(r'include', []))
excludes = set(opts.get(r'exclude', [])) excludes = set(opts.get(r'exclude', []))
includes, excludes, unused_invalid = narrowspec.restrictpatterns( includes, excludes, unused_invalid = narrowspec.restrictpatterns(
includes, excludes, repo_includes, repo_excludes) includes, excludes, repo_includes, repo_excludes)
if includes: if includes:
opts[r'include'] = includes opts[r'include'] = includes
if excludes: if excludes:
opts[r'exclude'] = excludes opts[r'exclude'] = excludes
return orig(ui, repo, *args, **opts) return orig(ui, repo, *args, **opts)
def pullbundle2extraprepare(orig, pullop, kwargs): def pullbundle2extraprepare(orig, pullop, kwargs):
repo = pullop.repo repo = pullop.repo
if narrowrepo.REQUIREMENT not in repo.requirements: if changegroup.NARROW_REQUIREMENT not in repo.requirements:
return orig(pullop, kwargs) return orig(pullop, kwargs)
if narrowbundle2.NARROWCAP not in pullop.remotebundle2caps: if narrowbundle2.NARROWCAP not in pullop.remotebundle2caps:
raise error.Abort(_("server doesn't support narrow clones")) raise error.Abort(_("server doesn't support narrow clones"))
orig(pullop, kwargs) orig(pullop, kwargs)
kwargs['narrow'] = True kwargs['narrow'] = True
include, exclude = repo.narrowpats include, exclude = repo.narrowpats
kwargs['oldincludepats'] = include kwargs['oldincludepats'] = include
The options allow you to add or remove included and excluded expressions. The options allow you to add or remove included and excluded expressions.
If --clear is specified, then all previous includes and excludes are DROPPED If --clear is specified, then all previous includes and excludes are DROPPED
and replaced by the new ones specified to --addinclude and --addexclude. and replaced by the new ones specified to --addinclude and --addexclude.
If --clear is specified without any further options, the narrowspec will be If --clear is specified without any further options, the narrowspec will be
empty and will not match any files. empty and will not match any files.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
if narrowrepo.REQUIREMENT not in repo.requirements: if changegroup.NARROW_REQUIREMENT not in repo.requirements:
ui.warn(_('The narrow command is only supported on respositories cloned' ui.warn(_('The narrow command is only supported on respositories cloned'
' with --narrow.\n')) ' with --narrow.\n'))
return 1 return 1
# Before supporting, decide whether it "hg tracked --clear" should mean # Before supporting, decide whether it "hg tracked --clear" should mean
# tracking no paths or all paths. # tracking no paths or all paths.
if opts['clear']: if opts['clear']:
ui.warn(_('The --clear option is not yet supported.\n')) ui.warn(_('The --clear option is not yet supported.\n'))

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,
hg, hg,
localrepo, localrepo,
match as matchmod, match as matchmod,
narrowspec, narrowspec,
scmutil, scmutil,
) )
from . import ( from . import (
narrowrevlog, narrowrevlog,
) )
# When narrowing is finalized and no longer subject to format changes,
# we should move this to just "narrow" or similar.
REQUIREMENT = 'narrowhg-experimental'
def wrappostshare(orig, sourcerepo, destrepo, **kwargs): def wrappostshare(orig, sourcerepo, destrepo, **kwargs):
orig(sourcerepo, destrepo, **kwargs) orig(sourcerepo, destrepo, **kwargs)
if REQUIREMENT in sourcerepo.requirements: if changegroup.NARROW_REQUIREMENT in sourcerepo.requirements:
with destrepo.wlock(): with destrepo.wlock():
with destrepo.vfs('shared', 'a') as fp: with destrepo.vfs('shared', 'a') as fp:
fp.write(narrowspec.FILENAME + '\n') fp.write(narrowspec.FILENAME + '\n')
def unsharenarrowspec(orig, ui, repo, repopath): def unsharenarrowspec(orig, ui, repo, repopath):
if (REQUIREMENT in repo.requirements if (changegroup.NARROW_REQUIREMENT in repo.requirements
and repo.path == repopath and repo.shared()): and repo.path == repopath and repo.shared()):
srcrepo = hg.sharedreposource(repo) srcrepo = hg.sharedreposource(repo)
with srcrepo.vfs(narrowspec.FILENAME) as f: with srcrepo.vfs(narrowspec.FILENAME) as f:
spec = f.read() spec = f.read()
with repo.vfs(narrowspec.FILENAME, 'w') as f: with repo.vfs(narrowspec.FILENAME, 'w') as f:
f.write(spec) f.write(spec)
return orig(ui, repo, repopath) return orig(ui, repo, repopath)

mercurial/changegroup.py

pycompat, pycompat,
util, util,
) )
_CHANGEGROUPV1_DELTA_HEADER = "20s20s20s20s" _CHANGEGROUPV1_DELTA_HEADER = "20s20s20s20s"
_CHANGEGROUPV2_DELTA_HEADER = "20s20s20s20s20s" _CHANGEGROUPV2_DELTA_HEADER = "20s20s20s20s20s"
_CHANGEGROUPV3_DELTA_HEADER = ">20s20s20s20s20sH" _CHANGEGROUPV3_DELTA_HEADER = ">20s20s20s20s20sH"
# When narrowing is finalized and no longer subject to format changes,
# we should move this to just "narrow" or similar.
NARROW_REQUIREMENT = 'narrowhg-experimental'
readexactly = util.readexactly readexactly = util.readexactly
def getchunk(stream): def getchunk(stream):
"""return the next chunk from stream as a string""" """return the next chunk from stream as a string"""
d = readexactly(stream, 4) d = readexactly(stream, 4)
l = struct.unpack(">l", d)[0] l = struct.unpack(">l", d)[0]
if l <= 4: if l <= 4:
if l: if l: