This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4094

narrow: move requirement constant from changegroup to repository
ClosedPublic

Authored by martinvonz on Aug 3 2018, 5:23 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHGa232e6744ba3: narrow: move requirement constant from changegroup to repository
Summary

As suggested by Gregory Szorc.

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.Aug 3 2018, 5:23 PM
pulkit accepted this revision.Aug 3 2018, 5:31 PM
Closed by commit rHGa232e6744ba3: narrow: move requirement constant from changegroup to repository (authored by martinvonz). · Explain WhyAug 3 2018, 6:01 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 9863

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,
repository,
verify as verifymod, verify as verifymod,
) )
from . import ( from . import (
narrowbundle2, narrowbundle2,
narrowchangegroup, narrowchangegroup,
narrowcommands, narrowcommands,
narrowcopies, narrowcopies,
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
def featuresetup(ui, features): def featuresetup(ui, features):
features.add(changegroup.NARROW_REQUIREMENT) features.add(repository.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."""
localrepo.featuresetupfuncs.add(featuresetup) localrepo.featuresetupfuncs.add(featuresetup)
narrowrevlog.setup() narrowrevlog.setup()
narrowbundle2.setup() narrowbundle2.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 repo.local(): if not repo.local():
return return
if changegroup.NARROW_REQUIREMENT in repo.requirements: if repository.NARROW_REQUIREMENT in repo.requirements:
narrowrepo.wraprepo(repo) narrowrepo.wraprepo(repo)
narrowcopies.setup(repo) narrowcopies.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
# be None from core. If another extension passes a matcher (unlikely), # be None from core. If another extension passes a matcher (unlikely),

hgext/narrow/narrowbundle2.py

from mercurial import ( from mercurial import (
bundle2, bundle2,
changegroup, changegroup,
error, error,
exchange, exchange,
extensions, extensions,
narrowspec, narrowspec,
repair, repair,
repository,
util, util,
wireprototypes, wireprototypes,
) )
from mercurial.utils import ( from mercurial.utils import (
stringutil, stringutil,
) )
NARROWCAP = 'narrow' NARROWCAP = 'narrow'
part.addparam('version', version) part.addparam('version', version)
if 'treemanifest' in repo.requirements: if 'treemanifest' in repo.requirements:
part.addparam('treemanifest', '1') part.addparam('treemanifest', '1')
@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())
if not changegroup.NARROW_REQUIREMENT in op.repo.requirements: if not repository.NARROW_REQUIREMENT in op.repo.requirements:
op.repo.requirements.add(changegroup.NARROW_REQUIREMENT) op.repo.requirements.add(repository.NARROW_REQUIREMENT)
op.repo._writerequirements() op.repo._writerequirements()
op.repo.setnarrowpats(includepats, excludepats) op.repo.setnarrowpats(includepats, excludepats)
@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/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 (
changegroup,
cmdutil, cmdutil,
commands, commands,
discovery, discovery,
error, error,
exchange, exchange,
extensions, extensions,
hg, hg,
merge, merge,
narrowspec, narrowspec,
node, node,
pycompat, pycompat,
registrar, registrar,
repair, repair,
repository,
repoview, repoview,
util, util,
) )
from . import ( from . import (
narrowbundle2, narrowbundle2,
) )
if opts.get('depth'): if opts.get('depth'):
kwargs['depth'] = opts['depth'] kwargs['depth'] = opts['depth']
wrappedextraprepare = extensions.wrappedfunction(exchange, wrappedextraprepare = extensions.wrappedfunction(exchange,
'_pullbundle2extraprepare', pullbundle2extraprepare_widen) '_pullbundle2extraprepare', pullbundle2extraprepare_widen)
def pullnarrow(orig, repo, *args, **kwargs): def pullnarrow(orig, repo, *args, **kwargs):
if opts_narrow: if opts_narrow:
repo.requirements.add(changegroup.NARROW_REQUIREMENT) repo.requirements.add(repository.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 changegroup.NARROW_REQUIREMENT in repo.requirements: if repository.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 changegroup.NARROW_REQUIREMENT in repo.requirements: if repository.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 changegroup.NARROW_REQUIREMENT not in repo.requirements: if repository.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 changegroup.NARROW_REQUIREMENT not in repo.requirements: if repository.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 (
changegroup,
hg, hg,
narrowspec, narrowspec,
repository,
) )
from . import ( from . import (
narrowdirstate, narrowdirstate,
narrowrevlog, narrowrevlog,
) )
def wrappostshare(orig, sourcerepo, destrepo, **kwargs): def wrappostshare(orig, sourcerepo, destrepo, **kwargs):
orig(sourcerepo, destrepo, **kwargs) orig(sourcerepo, destrepo, **kwargs)
if changegroup.NARROW_REQUIREMENT in sourcerepo.requirements: if repository.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 (changegroup.NARROW_REQUIREMENT in repo.requirements if (repository.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

from . import ( from . import (
dagutil, dagutil,
error, error,
manifest, manifest,
match as matchmod, match as matchmod,
mdiff, mdiff,
phases, phases,
pycompat, pycompat,
repository,
util, util,
) )
from .utils import ( from .utils import (
stringutil, stringutil,
) )
_CHANGEGROUPV1_DELTA_HEADER = "20s20s20s20s" _CHANGEGROUPV1_DELTA_HEADER = "20s20s20s20s"
_CHANGEGROUPV2_DELTA_HEADER = "20s20s20s20s20s" _CHANGEGROUPV2_DELTA_HEADER = "20s20s20s20s20s"
_CHANGEGROUPV3_DELTA_HEADER = ">20s20s20s20s20sH" _CHANGEGROUPV3_DELTA_HEADER = ">20s20s20s20s20sH"
LFS_REQUIREMENT = 'lfs' LFS_REQUIREMENT = 'lfs'
# 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:
if 'treemanifest' in repo.requirements: if 'treemanifest' in repo.requirements:
# Versions 01 and 02 support only flat manifests and it's just too # Versions 01 and 02 support only flat manifests and it's just too
# expensive to convert between the flat manifest and tree manifest on # expensive to convert between the flat manifest and tree manifest on
# the fly. Since tree manifests are hashed differently, all of history # the fly. Since tree manifests are hashed differently, all of history
# would have to be converted. Instead, we simply don't even pretend to # would have to be converted. Instead, we simply don't even pretend to
# support versions 01 and 02. # support versions 01 and 02.
versions.discard('01') versions.discard('01')
versions.discard('02') versions.discard('02')
if NARROW_REQUIREMENT in repo.requirements: if repository.NARROW_REQUIREMENT in repo.requirements:
# Versions 01 and 02 don't support revlog flags, and we need to # Versions 01 and 02 don't support revlog flags, and we need to
# support that for stripping and unbundling to work. # support that for stripping and unbundling to work.
versions.discard('01') versions.discard('01')
versions.discard('02') versions.discard('02')
if LFS_REQUIREMENT in repo.requirements: if LFS_REQUIREMENT in repo.requirements:
# Versions 01 and 02 don't support revlog flags, and we need to # Versions 01 and 02 don't support revlog flags, and we need to
# mark LFS entries with REVIDX_EXTSTORED. # mark LFS entries with REVIDX_EXTSTORED.
versions.discard('01') versions.discard('01')

mercurial/exchange.py

error, error,
lock as lockmod, lock as lockmod,
logexchange, logexchange,
narrowspec, narrowspec,
obsolete, obsolete,
phases, phases,
pushkey, pushkey,
pycompat, pycompat,
repository,
scmutil, scmutil,
sslutil, sslutil,
streamclone, streamclone,
url as urlmod, url as urlmod,
util, util,
) )
from .utils import ( from .utils import (
stringutil, stringutil,
def headsofunion(h1, h2): def headsofunion(h1, h2):
"""Returns heads((h1 + h2) - null)""" """Returns heads((h1 + h2) - null)"""
res = unfi.set('heads((%ln + %ln - null))', h1, h2) res = unfi.set('heads((%ln + %ln - null))', h1, h2)
return set(ctx.node() for ctx in res) return set(ctx.node() for ctx in res)
while True: while True:
old_heads = unficl.heads() old_heads = unficl.heads()
clstart = len(unficl) clstart = len(unficl)
_pullbundle2(pullop) _pullbundle2(pullop)
if changegroup.NARROW_REQUIREMENT in repo.requirements: if repository.NARROW_REQUIREMENT in repo.requirements:
# XXX narrow clones filter the heads on the server side during # XXX narrow clones filter the heads on the server side during
# XXX getbundle and result in partial replies as well. # XXX getbundle and result in partial replies as well.
# XXX Disable pull bundles in this case as band aid to avoid # XXX Disable pull bundles in this case as band aid to avoid
# XXX extra round trips. # XXX extra round trips.
break break
if clstart == len(unficl): if clstart == len(unficl):
break break
if all(unficl.hasnode(n) for n in pullop.rheads): if all(unficl.hasnode(n) for n in pullop.rheads):

mercurial/localrepo.py

source = self source = self
if self.shared(): if self.shared():
from . import hg from . import hg
source = hg.sharedreposource(self) source = hg.sharedreposource(self)
return narrowspec.load(source) return narrowspec.load(source)
@repofilecache(narrowspec.FILENAME) @repofilecache(narrowspec.FILENAME)
def _narrowmatch(self): def _narrowmatch(self):
if changegroup.NARROW_REQUIREMENT not in self.requirements: if repository.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

mercurial/repository.py

from .i18n import _ from .i18n import _
from . import ( from . import (
error, error,
) )
from .utils import ( from .utils import (
interfaceutil, interfaceutil,
) )
# When narrowing is finalized and no longer subject to format changes,
# we should move this to just "narrow" or similar.
NARROW_REQUIREMENT = 'narrowhg-experimental'
class ipeerconnection(interfaceutil.Interface): class ipeerconnection(interfaceutil.Interface):
"""Represents a "connection" to a repository. """Represents a "connection" to a repository.
This is the base interface for representing a connection to a repository. This is the base interface for representing a connection to a repository.
It holds basic properties and methods applicable to all peer types. It holds basic properties and methods applicable to all peer types.
This is not a complete interface definition and should not be used This is not a complete interface definition and should not be used
outside of this module. outside of this module.