[PATCH 5 of 5 V2] revset: replace predicate by revsetpredicate of registrar
FUJIWARA Katsunori
foozy at lares.dti.ne.jp
Sat Jan 16 09:32:15 CST 2016
# HG changeset patch
# User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
# Date 1452957858 -32400
# Sun Jan 17 00:24:18 2016 +0900
# Node ID 278b2ca2155b5ae1aeffa84a3821150acc7b1dd5
# Parent 896a6ef9ae67667cc01bc8cbfc370acce74c7193
revset: replace predicate by revsetpredicate of registrar
To make all built-in predicates be known to hggettext, loading
built-in predicates by loadpredicate() should be placed before fixing
i18nfunctions but after all of predicate decorating.
diff --git a/mercurial/revset.py b/mercurial/revset.py
--- a/mercurial/revset.py
+++ b/mercurial/revset.py
@@ -479,36 +479,7 @@ symbols = {}
# functions that just return a lot of changesets (like all) don't count here
safesymbols = set()
-class predicate(registrar.funcregistrar):
- """Decorator to register revset predicate
-
- Usage::
-
- @predicate('mypredicate(arg1, arg2[, arg3])')
- def mypredicatefunc(repo, subset, x):
- '''Explanation of this revset predicate ....
- '''
- pass
-
- The first string argument of the constructor is used also in
- online help.
-
- Use 'extpredicate' instead of this to register revset predicate in
- extensions.
- """
- table = symbols
- formatdoc = "``%s``\n %s"
- getname = registrar.funcregistrar.parsefuncdecl
-
- def __init__(self, decl, safe=False):
- """'safe' indicates whether a predicate is safe for DoS attack
- """
- super(predicate, self).__init__(decl)
- self.safe = safe
-
- def extraaction(self, name, func):
- if self.safe:
- safesymbols.add(name)
+predicate = registrar.revsetpredicate()
class extpredicate(registrar.delayregistrar):
"""Decorator to register revset predicate in extensions
@@ -3675,5 +3646,8 @@ def loadpredicate(ui, extname, predicate
if func._safe:
safesymbols.add(name)
+# load built-in predicates explicitly to setup safesymbols
+loadpredicate(None, None, predicate)
+
# tell hggettext to extract docstrings from these functions:
i18nfunctions = symbols.values()
More information about the Mercurial-devel
mailing list