This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2009

narrowtemplates: update to use registrar mechanism
ClosedPublic

Authored by durin42 on Feb 2 2018, 10:53 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGea02be8665ef: narrowtemplates: update to use registrar mechanism
Summary

It's worth considering at this point if we should just move the two
ellipsis functions to core tagged experimental or something, since
they're not really narrowing-specific...

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

durin42 created this revision.Feb 2 2018, 10:53 AM
indygreg accepted this revision.Feb 2 2018, 1:06 PM
This revision is now accepted and ready to land.Feb 2 2018, 1:06 PM
durin42 updated this revision to Diff 5514.Feb 12 2018, 3:23 PM
Closed by commit rHGea02be8665ef: narrowtemplates: update to use registrar mechanism (authored by durin42). · Explain WhyFeb 12 2018, 6:18 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 5553

hgext/narrow/__init__.py

localrepo.localrepository._basesupported.add(narrowrepo.REQUIREMENT) localrepo.localrepository._basesupported.add(narrowrepo.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()
narrowtemplates.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
assert matcher is None assert matcher is None
matcher = getattr(repo, 'narrowmatch', lambda: None)() matcher = getattr(repo, 'narrowmatch', lambda: None)()
orig(self, repo, matcher) orig(self, repo, matcher)
def extsetup(ui): def extsetup(ui):
extensions.wrapfunction(verifymod.verifier, '__init__', _verifierinit) extensions.wrapfunction(verifymod.verifier, '__init__', _verifierinit)
extensions.wrapfunction(hg, 'postshare', narrowrepo.wrappostshare) extensions.wrapfunction(hg, 'postshare', narrowrepo.wrappostshare)
extensions.wrapfunction(hg, 'copystore', narrowrepo.unsharenarrowspec) extensions.wrapfunction(hg, 'copystore', narrowrepo.unsharenarrowspec)
templatekeyword = narrowtemplates.templatekeyword
revsetpredicate = narrowtemplates.revsetpredicate

hgext/narrow/narrowtemplates.py

# narrowtemplates.py - added template keywords for narrow clones # narrowtemplates.py - added template keywords for 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 import ( from mercurial import (
registrar,
revlog, revlog,
revset,
templatekw,
util, util,
) )
keywords = {}
templatekeyword = registrar.templatekeyword(keywords)
revsetpredicate = registrar.revsetpredicate()
def _isellipsis(repo, rev): def _isellipsis(repo, rev):
if repo.changelog.flags(rev) & revlog.REVIDX_ELLIPSIS: if repo.changelog.flags(rev) & revlog.REVIDX_ELLIPSIS:
return True return True
return False return False
@templatekeyword('ellipsis')
def ellipsis(repo, ctx, templ, **args): def ellipsis(repo, ctx, templ, **args):
""":ellipsis: String. 'ellipsis' if the change is an ellipsis node, """:ellipsis: String. 'ellipsis' if the change is an ellipsis node,
else ''.""" else ''."""
if _isellipsis(repo, ctx.rev()): if _isellipsis(repo, ctx.rev()):
return 'ellipsis' return 'ellipsis'
return '' return ''
@templatekeyword('outsidenarrow')
def outsidenarrow(repo, ctx, templ, **args): def outsidenarrow(repo, ctx, templ, **args):
""":outsidenarrow: String. 'outsidenarrow' if the change affects no """:outsidenarrow: String. 'outsidenarrow' if the change affects no
tracked files, else ''.""" tracked files, else ''."""
if util.safehasattr(repo, 'narrowmatch'): if util.safehasattr(repo, 'narrowmatch'):
m = repo.narrowmatch() m = repo.narrowmatch()
if not any(m(f) for f in ctx.files()): if not any(m(f) for f in ctx.files()):
return 'outsidenarrow' return 'outsidenarrow'
return '' return ''
@revsetpredicate('ellipsis')
def ellipsisrevset(repo, subset, x): def ellipsisrevset(repo, subset, x):
"""``ellipsis()`` """``ellipsis()``
Changesets that are ellipsis nodes. Changesets that are ellipsis nodes.
""" """
return subset.filter(lambda r: _isellipsis(repo, r)) return subset.filter(lambda r: _isellipsis(repo, r))
def setup():
templatekw.keywords['ellipsis'] = ellipsis
templatekw.keywords['outsidenarrow'] = outsidenarrow
revset.symbols['ellipsis'] = ellipsisrevset
revset.safesymbols.add('ellipsis')