This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4530

narrow: drop support for remote expansion (BC)
ClosedPublic

Authored by indygreg on Sep 11 2018, 6:59 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHG10a8472f6662: narrow: drop support for remote expansion (BC)
Summary

Previous patches to validate narrow patterns accidentically dropped
support for the include: syntax that allows patterns to be expanded
from a remote.

This feature was never implemented in core and is only implemented on
Google's custom server. Per @martinvonz's review comment in D4522, it
is OK to drop this feature since it isn't used.

The concept of this feature does seem useful. I anticipate it making
a comeback some day in some shape or form. But for now, let's jettison
the dead code.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Sep 11 2018, 6:59 PM
pulkit accepted this revision.Sep 12 2018, 7:49 AM
Closed by commit rHG10a8472f6662: narrow: drop support for remote expansion (BC) (authored by indygreg). · Explain WhySep 12 2018, 8:31 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 10903

hgext/narrow/TODO.rst

narrowfilelog. There could be some surprises lurking there. narrowfilelog. There could be some surprises lurking there.
Formally document the narrowspec format. Unify with sparse, if at all Formally document the narrowspec format. Unify with sparse, if at all
possible. For bonus points, unify with the server-specified narrowspec possible. For bonus points, unify with the server-specified narrowspec
format. format.
narrowrepo.setnarrowpats() or narrowspec.save() need to make sure narrowrepo.setnarrowpats() or narrowspec.save() need to make sure
they're holding the wlock. they're holding the wlock.
Implement a simple version of the expandnarrow wireproto command for
core. Having configurable shorthands for narrowspecs has been useful
at Google (and sparse has a similar feature from Facebook), so it
probably makes sense to implement the feature in core. (Google's
handler is entirely custom to Google, with a custom format related to
bazel's build language, so it's not in the narrowhg distribution.)

hgext/narrow/narrowcommands.py

_("do not fetch this file/directory, even if included"))) _("do not fetch this file/directory, even if included")))
entry = extensions.wrapcommand(commands.table, 'pull', pullnarrowcmd) entry = extensions.wrapcommand(commands.table, 'pull', pullnarrowcmd)
entry[1].append(('', 'depth', '', entry[1].append(('', 'depth', '',
_("limit the history fetched by distance from heads"))) _("limit the history fetched by distance from heads")))
extensions.wrapcommand(commands.table, 'archive', archivenarrowcmd) extensions.wrapcommand(commands.table, 'archive', archivenarrowcmd)
def expandpull(pullop, includepats, excludepats):
if not narrowspec.needsexpansion(includepats):
return includepats, excludepats
heads = pullop.heads or pullop.rheads
includepats, excludepats = pullop.remote.expandnarrow(
includepats, excludepats, heads)
pullop.repo.ui.debug('Expanded narrowspec to inc=%s, exc=%s\n' % (
includepats, excludepats))
includepats = set(includepats)
excludepats = set(excludepats)
# Nefarious remote could supply unsafe patterns. Validate them.
narrowspec.validatepatterns(includepats)
narrowspec.validatepatterns(excludepats)
return includepats, excludepats
def clonenarrowcmd(orig, ui, repo, *args, **opts): def clonenarrowcmd(orig, ui, repo, *args, **opts):
"""Wraps clone command, so 'hg clone' first wraps localrepo.clone().""" """Wraps clone command, so 'hg clone' first wraps localrepo.clone()."""
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
wrappedextraprepare = util.nullcontextmanager() wrappedextraprepare = util.nullcontextmanager()
opts_narrow = opts['narrow'] opts_narrow = opts['narrow']
narrowspecfile = opts['narrowspec'] narrowspecfile = opts['narrowspec']
if narrowspecfile: if narrowspecfile:
opts['exclude'].extend(excludes) opts['exclude'].extend(excludes)
if opts_narrow: if opts_narrow:
def pullbundle2extraprepare_widen(orig, pullop, kwargs): def pullbundle2extraprepare_widen(orig, pullop, kwargs):
# Create narrow spec patterns from clone flags # Create narrow spec patterns from clone flags
includepats = narrowspec.parsepatterns(opts['include']) includepats = narrowspec.parsepatterns(opts['include'])
excludepats = narrowspec.parsepatterns(opts['exclude']) excludepats = narrowspec.parsepatterns(opts['exclude'])
# If necessary, ask the server to expand the narrowspec.
includepats, excludepats = expandpull(
pullop, includepats, excludepats)
if not includepats and excludepats: if not includepats and excludepats:
# If nothing was included, we assume the user meant to include # If nothing was included, we assume the user meant to include
# everything, except what they asked to exclude. # everything, except what they asked to exclude.
includepats = {'path:.'} includepats = {'path:.'}
pullop.repo.setnarrowpats(includepats, excludepats) pullop.repo.setnarrowpats(includepats, excludepats)
# This will populate 'includepats' etc with the values from the # This will populate 'includepats' etc with the values from the
repo.wvfs.unlinkpath(f) repo.wvfs.unlinkpath(f)
repo.setnarrowpats(newincludes, newexcludes) repo.setnarrowpats(newincludes, newexcludes)
repo.destroyed() repo.destroyed()
def _widen(ui, repo, remote, commoninc, newincludes, newexcludes): def _widen(ui, repo, remote, commoninc, newincludes, newexcludes):
newmatch = narrowspec.match(repo.root, newincludes, newexcludes) newmatch = narrowspec.match(repo.root, newincludes, newexcludes)
# TODO(martinvonz): Get expansion working with widening/narrowing.
if narrowspec.needsexpansion(newincludes):
raise error.Abort('Expansion not yet supported on pull')
def pullbundle2extraprepare_widen(orig, pullop, kwargs): def pullbundle2extraprepare_widen(orig, pullop, kwargs):
orig(pullop, kwargs) orig(pullop, kwargs)
# The old{in,ex}cludepats have already been set by orig() # The old{in,ex}cludepats have already been set by orig()
kwargs['includepats'] = newincludes kwargs['includepats'] = newincludes
kwargs['excludepats'] = newexcludes kwargs['excludepats'] = newexcludes
kwargs['widen'] = True kwargs['widen'] = True
wrappedextraprepare = extensions.wrappedfunction(exchange, wrappedextraprepare = extensions.wrappedfunction(exchange,
'_pullbundle2extraprepare', pullbundle2extraprepare_widen) '_pullbundle2extraprepare', pullbundle2extraprepare_widen)
includepats, excludepats, profiles = sparse.parseconfig(ui, fdata, includepats, excludepats, profiles = sparse.parseconfig(ui, fdata,
'narrow') 'narrow')
if profiles: if profiles:
raise error.Abort(_("including other spec files using '%include' " raise error.Abort(_("including other spec files using '%include' "
"is not supported in narrowspec")) "is not supported in narrowspec"))
opts['addinclude'].extend(includepats) opts['addinclude'].extend(includepats)
opts['addexclude'].extend(excludepats) opts['addexclude'].extend(excludepats)
if narrowspec.needsexpansion(opts['addinclude'] + opts['addexclude']):
raise error.Abort('Expansion not yet supported on widen/narrow')
addedincludes = narrowspec.parsepatterns(opts['addinclude']) addedincludes = narrowspec.parsepatterns(opts['addinclude'])
removedincludes = narrowspec.parsepatterns(opts['removeinclude']) removedincludes = narrowspec.parsepatterns(opts['removeinclude'])
addedexcludes = narrowspec.parsepatterns(opts['addexclude']) addedexcludes = narrowspec.parsepatterns(opts['addexclude'])
removedexcludes = narrowspec.parsepatterns(opts['removeexclude']) removedexcludes = narrowspec.parsepatterns(opts['removeexclude'])
widening = addedincludes or removedexcludes widening = addedincludes or removedexcludes
narrowing = removedincludes or addedexcludes narrowing = removedincludes or addedexcludes
only_show = not widening and not narrowing only_show = not widening and not narrowing

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 import ( from mercurial import (
error,
extensions, extensions,
hg, hg,
narrowspec,
node,
wireprotov1server, wireprotov1server,
) )
NARROWCAP = 'exp-narrow-1' NARROWCAP = 'exp-narrow-1'
ELLIPSESCAP = 'exp-ellipses-1' ELLIPSESCAP = 'exp-ellipses-1'
def uisetup(): def uisetup():
def peersetup(ui, peer):
# We must set up the expansion before reposetup below, since it's used
# at clone time before we have a repo.
class expandingpeer(peer.__class__):
def expandnarrow(self, narrow_include, narrow_exclude, nodes):
ui.status(_("expanding narrowspec\n"))
if not self.capable('exp-expandnarrow'):
raise error.Abort(
'peer does not support expanding narrowspecs')
hex_nodes = (node.hex(n) for n in nodes)
new_narrowspec = self._call(
'expandnarrow',
includepats=','.join(narrow_include),
excludepats=','.join(narrow_exclude),
nodes=','.join(hex_nodes))
return narrowspec.parseserverpatterns(new_narrowspec)
peer.__class__ = expandingpeer
hg.wirepeersetupfuncs.append(peersetup)
extensions.wrapfunction(wireprotov1server, '_capabilities', addnarrowcap) extensions.wrapfunction(wireprotov1server, '_capabilities', addnarrowcap)
def addnarrowcap(orig, repo, proto): def addnarrowcap(orig, repo, proto):
"""add the narrow capability to the server""" """add the narrow capability to the server"""
caps = orig(repo, proto) caps = orig(repo, proto)
caps.append(NARROWCAP) caps.append(NARROWCAP)
if repo.ui.configbool('experimental', 'narrowservebrokenellipses'): if repo.ui.configbool('experimental', 'narrowservebrokenellipses'):
caps.append(ELLIPSESCAP) caps.append(ELLIPSESCAP)

mercurial/narrowspec.py

if not include: if not include:
# Passing empty include and empty exclude to matchmod.match() # Passing empty include and empty exclude to matchmod.match()
# gives a matcher that matches everything, so explicitly use # gives a matcher that matches everything, so explicitly use
# the nevermatcher. # the nevermatcher.
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):
return [i for i in includes if i.startswith('include:')]
def load(repo): def load(repo):
try: try:
spec = repo.svfs.read(FILENAME) spec = repo.svfs.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:
return set(), set() return set(), set()