mercurial-scm/hg-stable: mercurial/revset.py comparison

comparison mercurial/revset.py @ 27587:c8dc480142a8

revset: use decorator to mark a predicate as safe Using decorator can localize changes for adding (or removing) a "safe" revset predicate function in source code. To avoid accidentaly treating unsuitable predicates as safe, this patch uses False as default value of "safe" argument. This forces safe predicates to be decorated with explicit 'safe=True'.

author	FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date	Tue, 29 Dec 2015 23:58:30 +0900
parents	42910f9fffeb
children	b502138f5faa

comparison

equal deleted inserted replaced

-:42910f9fffeb
+:c8dc480142a8
 #   repo - current repository instance
 #   subset - of revisions to be examined
 #   x - argument in tree form
 symbols = {}
+# symbols which can't be used for a DoS attack for any given input
+# (e.g. those which accept regexes as plain strings shouldn't be included)
+# 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::
 """
 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)
 class extpredicate(registrar.delayregistrar):
 """Decorator to register revset predicate in extensions
 Usage::
 def _destmerge(repo, subset, x):
 # experimental revset for merge destination
 getargs(x, 0, 0, _("_mergedefaultdest takes no arguments"))
 return subset & baseset([destutil.destmerge(repo)])
-@predicate('adds(pattern)')
+@predicate('adds(pattern)', safe=True)
 def adds(repo, subset, x):
 """Changesets that add a file matching pattern.
 The pattern without explicit kind like ``glob:`` is expected to be
 relative to the current directory and match against a file or a
 """
 # i18n: "adds" is a keyword
 pat = getstring(x, _("adds requires a pattern"))
 return checkstatus(repo, subset, pat, 1)
-@predicate('ancestor(*changeset)')
+@predicate('ancestor(*changeset)', safe=True)
 def ancestor(repo, subset, x):
 """A greatest common ancestor of the changesets.
 Accepts 0 or more changesets.
 Will return empty list when passed no args.
 if not heads:
 return baseset()
 s = _revancestors(repo, heads, followfirst)
 return subset & s
-@predicate('ancestors(set)')
+@predicate('ancestors(set)', safe=True)
 def ancestors(repo, subset, x):
 """Changesets that are ancestors of a changeset in set.
 """
 return _ancestors(repo, subset, x)
-@predicate('_firstancestors')
+@predicate('_firstancestors', safe=True)
 def _firstancestors(repo, subset, x):
 # ``_firstancestors(set)``
 # Like ``ancestors(set)`` but follows only the first parents.
 return _ancestors(repo, subset, x, followfirst=True)
 for i in range(n):
 r = cl.parentrevs(r)[0]
 ps.add(r)
 return subset & ps
-@predicate('author(string)')
+@predicate('author(string)', safe=True)
 def author(repo, subset, x):
 """Alias for ``user(string)``.
 """
 # i18n: "author" is a keyword
 n = encoding.lower(getstring(x, _("author requires a string")))
 kind, pattern, matcher = _substringmatcher(n)
 return subset.filter(lambda x: matcher(encoding.lower(repo[x].user())))
-@predicate('bisect(string)')
+@predicate('bisect(string)', safe=True)
 def bisect(repo, subset, x):
 """Changesets marked in the specified bisect status:
 - ``good``, ``bad``, ``skip``: csets explicitly marked as good/bad/skip
 - ``goods``, ``bads``      : csets topologically good/bad
 state = set(hbisect.get(repo, status))
 return subset & state
 # Backward-compatibility
 # - no help entry so that we do not advertise it any more
-@predicate('bisected')
+@predicate('bisected', safe=True)
 def bisected(repo, subset, x):
 return bisect(repo, subset, x)
-@predicate('bookmark([name])')
+@predicate('bookmark([name])', safe=True)
 def bookmark(repo, subset, x):
 """The named bookmark or all bookmarks.
 If `name` starts with `re:`, the remainder of the name is treated as
 a regular expression. To match a bookmark that actually starts with `re:`,
 bms = set([repo[r].rev()
 for r in repo._bookmarks.values()])
 bms -= set([node.nullrev])
 return subset & bms
-@predicate('branch(string or set)')
+@predicate('branch(string or set)', safe=True)
 def branch(repo, subset, x):
 """
 All changesets belonging to the given branch or the branches of the given
 changesets.
 for r in s:
 b.add(getbi(r)[0])
 c = s.__contains__
 return subset.filter(lambda r: c(r) or getbi(r)[0] in b)
-@predicate('bumped()')
+@predicate('bumped()', safe=True)
 def bumped(repo, subset, x):
 """Mutable changesets marked as successors of public changesets.
 Only non-public and non-obsolete changesets can be `bumped`.
 """
 # i18n: "bumped" is a keyword
 getargs(x, 0, 0, _("bumped takes no arguments"))
 bumped = obsmod.getrevs(repo, 'bumped')
 return subset & bumped
-@predicate('bundle()')
+@predicate('bundle()', safe=True)
 def bundle(repo, subset, x):
 """Changesets in the bundle.
 Bundle must be specified by the -R option."""
 cs.add(r)
 # XXX using a set to feed the baseset is wrong. Sets are not ordered.
 # This does not break because of other fullreposet misbehavior.
 return baseset(cs)
-@predicate('children(set)')
+@predicate('children(set)', safe=True)
 def children(repo, subset, x):
 """Child changesets of changesets in set.
 """
 s = getset(repo, fullreposet(repo), x)
 cs = _children(repo, subset, s)
 return subset & cs
-@predicate('closed()')
+@predicate('closed()', safe=True)
 def closed(repo, subset, x):
 """Changeset is closed.
 """
 # i18n: "closed" is a keyword
 getargs(x, 0, 0, _("closed takes no arguments"))
 return True
 return False
 return subset.filter(matches)
-@predicate('converted([id])')
+@predicate('converted([id])', safe=True)
 def converted(repo, subset, x):
 """Changesets converted from the given identifier in the old repository if
 present, or all converted changesets if no identifier is specified.
 """
 source = repo[r].extra().get('convert_revision', None)
 return source is not None and (rev is None or source.startswith(rev))
 return subset.filter(lambda r: _matchvalue(r))
-@predicate('date(interval)')
+@predicate('date(interval)', safe=True)
 def date(repo, subset, x):
 """Changesets within the interval, see :hg:`help dates`.
 """
 # i18n: "date" is a keyword
 ds = getstring(x, _("date requires a string"))
 dm = util.matchdate(ds)
 return subset.filter(lambda x: dm(repo[x].date()[0]))
-@predicate('desc(string)')
+@predicate('desc(string)', safe=True)
 def desc(repo, subset, x):
 """Search commit message for string. The match is case-insensitive.
 """
 # i18n: "desc" is a keyword
 ds = encoding.lower(getstring(x, _("desc requires a string")))
 result.sort(reverse=True)
 else:
 result = subset & result
 return result
-@predicate('descendants(set)')
+@predicate('descendants(set)', safe=True)
 def descendants(repo, subset, x):
 """Changesets which are descendants of changesets in set.
 """
 return _descendants(repo, subset, x)
-@predicate('_firstdescendants')
+@predicate('_firstdescendants', safe=True)
 def _firstdescendants(repo, subset, x):
 # ``_firstdescendants(set)``
 # Like ``descendants(set)`` but follows only the first parents.
 return _descendants(repo, subset, x, followfirst=True)
-@predicate('destination([set])')
+@predicate('destination([set])', safe=True)
 def destination(repo, subset, x):
 """Changesets that were created by a graft, transplant or rebase operation,
 with the given revisions specified as the source.  Omitting the optional set
 is the same as passing all().
 """
 r = src
 src = _getrevsource(repo, r)
 return subset.filter(dests.__contains__)
-@predicate('divergent()')
+@predicate('divergent()', safe=True)
 def divergent(repo, subset, x):
 """
 Final successors of changesets with an alternative set of final successors.
 """
 # i18n: "divergent" is a keyword
 getargs(x, 0, 0, _("divergent takes no arguments"))
 divergent = obsmod.getrevs(repo, 'divergent')
 return subset & divergent
-@predicate('extinct()')
+@predicate('extinct()', safe=True)
 def extinct(repo, subset, x):
 """Obsolete changesets with obsolete descendants only.
 """
 # i18n: "extinct" is a keyword
 getargs(x, 0, 0, _("extinct takes no arguments"))
 extincts = obsmod.getrevs(repo, 'extinct')
 return subset & extincts
-@predicate('extra(label, [value])')
+@predicate('extra(label, [value])', safe=True)
 def extra(repo, subset, x):
 """Changesets with the given label in the extra metadata, with the given
 optional value.
 If `value` starts with `re:`, the remainder of the value is treated as
 extra = repo[r].extra()
 return label in extra and (value is None or matcher(extra[label]))
 return subset.filter(lambda r: _matchvalue(r))
-@predicate('filelog(pattern)')
+@predicate('filelog(pattern)', safe=True)
 def filelog(repo, subset, x):
 """Changesets connected to the specified filelog.
 For performance reasons, visits only revisions mentioned in the file-level
 filelog, rather than filtering through all changesets (much faster, but
 backrevref[fr] = rev
 s.add(rev)
 return subset & s
-@predicate('first(set, [n])')
+@predicate('first(set, [n])', safe=True)
 def first(repo, subset, x):
 """An alias for limit().
 """
 return limit(repo, subset, x)
 else:
 s = _revancestors(repo, baseset([c.rev()]), followfirst)
 return subset & s
-@predicate('follow([pattern])')
+@predicate('follow([pattern])', safe=True)
 def follow(repo, subset, x):
 """
 An alias for ``::.`` (ancestors of the working directory's first parent).
 If pattern is specified, the histories of files matching given
 pattern is followed, including copies.
 """
 return _follow(repo, subset, x, 'follow')
-@predicate('_followfirst')
+@predicate('_followfirst', safe=True)
 def _followfirst(repo, subset, x):
 # ``followfirst([pattern])``
 # Like ``follow([pattern])`` but follows only the first parent of
 # every revisions or files revisions.
 return _follow(repo, subset, x, '_followfirst', followfirst=True)
-@predicate('all()')
+@predicate('all()', safe=True)
 def getall(repo, subset, x):
 """All changesets, the same as ``0:tip``.
 """
 # i18n: "all" is a keyword
 getargs(x, 0, 0, _("all takes no arguments"))
 return True
 return False
 return subset.filter(matches)
-@predicate('_matchfiles')
+@predicate('_matchfiles', safe=True)
 def _matchfiles(repo, subset, x):
 # _matchfiles takes a revset list of prefixed arguments:
 #
 #   [p:foo, i:bar, x:baz]
 #
 return True
 return False
 return subset.filter(matches)
-@predicate('file(pattern)')
+@predicate('file(pattern)', safe=True)
 def hasfile(repo, subset, x):
 """Changesets affecting files matched by pattern.
 For a faster but less accurate result, consider using ``filelog()``
 instead.
 """
 # i18n: "file" is a keyword
 pat = getstring(x, _("file requires a pattern"))
 return _matchfiles(repo, subset, ('string', 'p:' + pat))
-@predicate('head()')
+@predicate('head()', safe=True)
 def head(repo, subset, x):
 """Changeset is a named branch head.
 """
 # i18n: "head" is a keyword
 getargs(x, 0, 0, _("head takes no arguments"))
 # This does not break because of other fullreposet misbehavior.
 # XXX We should combine with subset first: 'subset & baseset(...)'. This is
 # necessary to ensure we preserve the order in subset.
 return baseset(hs) & subset
-@predicate('heads(set)')
+@predicate('heads(set)', safe=True)
 def heads(repo, subset, x):
 """Members of set with no children in set.
 """
 s = getset(repo, subset, x)
 ps = parents(repo, subset, x)
 return s - ps
-@predicate('hidden()')
+@predicate('hidden()', safe=True)
 def hidden(repo, subset, x):
 """Hidden changesets.
 """
 # i18n: "hidden" is a keyword
 getargs(x, 0, 0, _("hidden takes no arguments"))
 hiddenrevs = repoview.filterrevs(repo, 'visible')
 return subset & hiddenrevs
-@predicate('keyword(string)')
+@predicate('keyword(string)', safe=True)
 def keyword(repo, subset, x):
 """Search commit message, user name, and names of changed files for
 string. The match is case-insensitive.
 """
 # i18n: "keyword" is a keyword
 return any(kw in encoding.lower(t)
 for t in c.files() + [c.user(), c.description()])
 return subset.filter(matches)
-@predicate('limit(set[, n[, offset]])')
+@predicate('limit(set[, n[, offset]])', safe=True)
 def limit(repo, subset, x):
 """First n members of set, defaulting to 1, starting from offset.
 """
 args = getargsdict(x, 'limit', 'set n offset')
 if 'set' not in args:
 break
 elif y in subset:
 result.append(y)
 return baseset(result)
-@predicate('last(set, [n])')
+@predicate('last(set, [n])', safe=True)
 def last(repo, subset, x):
 """Last n members of set, defaulting to 1.
 """
 # i18n: "last" is a keyword
 l = getargs(x, 1, 2, _("last requires one or two arguments"))
 break
 elif y in subset:
 result.append(y)
 return baseset(result)
-@predicate('max(set)')
+@predicate('max(set)', safe=True)
 def maxrev(repo, subset, x):
 """Changeset with highest revision number in set.
 """
 os = getset(repo, fullreposet(repo), x)
 try:
 # os.max() throws a ValueError when the collection is empty.
 # Same as python's max().
 pass
 return baseset()
-@predicate('merge()')
+@predicate('merge()', safe=True)
 def merge(repo, subset, x):
 """Changeset is a merge changeset.
 """
 # i18n: "merge" is a keyword
 getargs(x, 0, 0, _("merge takes no arguments"))
 cl = repo.changelog
 return subset.filter(lambda r: cl.parentrevs(r)[1] != -1)
-@predicate('branchpoint()')
+@predicate('branchpoint()', safe=True)
 def branchpoint(repo, subset, x):
 """Changesets with more than one child.
 """
 # i18n: "branchpoint" is a keyword
 getargs(x, 0, 0, _("branchpoint takes no arguments"))
 for p in cl.parentrevs(r):
 if p >= baserev:
 parentscount[p - baserev] += 1
 return subset.filter(lambda r: parentscount[r - baserev] > 1)
-@predicate('min(set)')
+@predicate('min(set)', safe=True)
 def minrev(repo, subset, x):
 """Changeset with lowest revision number in set.
 """
 os = getset(repo, fullreposet(repo), x)
 try:
 # os.min() throws a ValueError when the collection is empty.
 # Same as python's min().
 pass
 return baseset()
-@predicate('modifies(pattern)')
+@predicate('modifies(pattern)', safe=True)
 def modifies(repo, subset, x):
 """Changesets modifying files matched by pattern.
 The pattern without explicit kind like ``glob:`` is expected to be
 relative to the current directory and match against a file or a
 names.update(repo[n].rev() for n in ns.nodes(repo, name))
 names -= set([node.nullrev])
 return subset & names
-@predicate('id(string)')
+@predicate('id(string)', safe=True)
 def node_(repo, subset, x):
 """Revision non-ambiguously specified by the given hex string prefix.
 """
 # i18n: "id" is a keyword
 l = getargs(x, 1, 1, _("id requires one argument"))
 if rn is None:
 return baseset()
 result = baseset([rn])
 return result & subset
-@predicate('obsolete()')
+@predicate('obsolete()', safe=True)
 def obsolete(repo, subset, x):
 """Mutable changeset with a newer version."""
 # i18n: "obsolete" is a keyword
 getargs(x, 0, 0, _("obsolete takes no arguments"))
 obsoletes = obsmod.getrevs(repo, 'obsolete')
 return subset & obsoletes
-@predicate('only(set, [set])')
+@predicate('only(set, [set])', safe=True)
 def only(repo, subset, x):
 """Changesets that are ancestors of the first set that are not ancestors
 of any other head in the repo. If a second set is specified, the result
 is ancestors of the first set that are not ancestors of the second set
 (i.e. ::<set1> - ::<set2>).
 results = set(cl.findmissingrevs(common=exclude, heads=include))
 # XXX we should turn this into a baseset instead of a set, smartset may do
 # some optimisations from the fact this is a baseset.
 return subset & results
-@predicate('origin([set])')
+@predicate('origin([set])', safe=True)
 def origin(repo, subset, x):
 """
 Changesets that were specified as a source for the grafts, transplants or
 rebases that created the given revisions.  Omitting the optional set is the
 same as passing all().  If a changeset created by these operations is itself
 o -= set([None])
 # XXX we should turn this into a baseset instead of a set, smartset may do
 # some optimisations from the fact this is a baseset.
 return subset & o
-@predicate('outgoing([path])')
+@predicate('outgoing([path])', safe=True)
 def outgoing(repo, subset, x):
 """Changesets not found in the specified destination repository, or the
 default push location.
 """
 # Avoid cycles.
 repo.ui.popbuffer()
 cl = repo.changelog
 o = set([cl.rev(r) for r in outgoing.missing])
 return subset & o
-@predicate('p1([set])')
+@predicate('p1([set])', safe=True)
 def p1(repo, subset, x):
 """First parent of changesets in set, or the working directory.
 """
 if x is None:
 p = repo[x].p1().rev()
 ps -= set([node.nullrev])
 # XXX we should turn this into a baseset instead of a set, smartset may do
 # some optimisations from the fact this is a baseset.
 return subset & ps
-@predicate('p2([set])')
+@predicate('p2([set])', safe=True)
 def p2(repo, subset, x):
 """Second parent of changesets in set, or the working directory.
 """
 if x is None:
 ps = repo[x].parents()
 ps -= set([node.nullrev])
 # XXX we should turn this into a baseset instead of a set, smartset may do
 # some optimisations from the fact this is a baseset.
 return subset & ps
-@predicate('parents([set])')
+@predicate('parents([set])', safe=True)
 def parents(repo, subset, x):
 """
 The set of all parents for all changesets in set, or the working directory.
 """
 if x is None:
 else:
 phase = repo._phasecache.phase
 condition = lambda r: phase(repo, r) == target
 return subset.filter(condition, cache=False)
-@predicate('draft()')
+@predicate('draft()', safe=True)
 def draft(repo, subset, x):
 """Changeset in draft phase."""
 # i18n: "draft" is a keyword
 getargs(x, 0, 0, _("draft takes no arguments"))
 target = phases.draft
 return _phase(repo, subset, target)
-@predicate('secret()')
+@predicate('secret()', safe=True)
 def secret(repo, subset, x):
 """Changeset in secret phase."""
 # i18n: "secret" is a keyword
 getargs(x, 0, 0, _("secret takes no arguments"))
 target = phases.secret
 parents = cl.parentrevs(r)
 if len(parents) > 1:
 ps.add(parents[1])
 return subset & ps
-@predicate('present(set)')
+@predicate('present(set)', safe=True)
 def present(repo, subset, x):
 """An empty set, if any revision in set isn't found; otherwise,
 all revisions in set.
 If any of specified revisions is not present in the local repository,
 return getset(repo, subset, x)
 except error.RepoLookupError:
 return baseset()
 # for internal use
-@predicate('_notpublic')
+@predicate('_notpublic', safe=True)
 def _notpublic(repo, subset, x):
 getargs(x, 0, 0, "_notpublic takes no arguments")
 repo._phasecache.loadphaserevs(repo) # ensure phase's sets are loaded
 if repo._phasecache._phasesets:
 s = set()
 phase = repo._phasecache.phase
 target = phases.public
 condition = lambda r: phase(repo, r) != target
 return subset.filter(condition, cache=False)
-@predicate('public()')
+@predicate('public()', safe=True)
 def public(repo, subset, x):
 """Changeset in public phase."""
 # i18n: "public" is a keyword
 getargs(x, 0, 0, _("public takes no arguments"))
 phase = repo._phasecache.phase
 target = phases.public
 condition = lambda r: phase(repo, r) == target
 return subset.filter(condition, cache=False)
-@predicate('remote([id [,path]])')
+@predicate('remote([id [,path]])', safe=True)
 def remote(repo, subset, x):
 """Local revision that corresponds to the given identifier in a
 remote repository, if present. Here, the '.' identifier is a
 synonym for the current local branch.
 """
 r = repo[n].rev()
 if r in subset:
 return baseset([r])
 return baseset()
-@predicate('removes(pattern)')
+@predicate('removes(pattern)', safe=True)
 def removes(repo, subset, x):
 """Changesets which remove files matching pattern.
 The pattern without explicit kind like ``glob:`` is expected to be
 relative to the current directory and match against a file or a
 """
 # i18n: "removes" is a keyword
 pat = getstring(x, _("removes requires a pattern"))
 return checkstatus(repo, subset, pat, 2)
-@predicate('rev(number)')
+@predicate('rev(number)', safe=True)
 def rev(repo, subset, x):
 """Revision with the given numeric identifier.
 """
 # i18n: "rev" is a keyword
 l = getargs(x, 1, 1, _("rev requires one argument"))
 raise error.ParseError(_("rev expects a number"))
 if l not in repo.changelog and l != node.nullrev:
 return baseset()
 return subset & baseset([l])
-@predicate('matching(revision [, field])')
+@predicate('matching(revision [, field])', safe=True)
 def matching(repo, subset, x):
 """Changesets in which a given set of fields match the set of fields in the
 selected revision or set.
 To match more than one field pass the list of fields to match separated
 return True
 return False
 return subset.filter(matches)
-@predicate('reverse(set)')
+@predicate('reverse(set)', safe=True)
 def reverse(repo, subset, x):
 """Reverse order of set.
 """
 l = getset(repo, subset, x)
 l.reverse()
 return l
-@predicate('roots(set)')
+@predicate('roots(set)', safe=True)
 def roots(repo, subset, x):
 """Changesets in set with no parent changeset in set.
 """
 s = getset(repo, fullreposet(repo), x)
 parents = repo.changelog.parentrevs
 if 0 <= p and p in s:
 return False
 return True
 return subset & s.filter(filter)
-@predicate('sort(set[, [-]key...])')
+@predicate('sort(set[, [-]key...])', safe=True)
 def sort(repo, subset, x):
 """Sort set by keys. The default sort order is ascending, specify a key
 as ``-key`` to sort in descending order.
 The keys can be:
 kind, pattern, matcher = util.stringmatcher(pattern)
 if kind == 'literal':
 matcher = lambda s: pattern in s
 return kind, pattern, matcher
-@predicate('tag([name])')
+@predicate('tag([name])', safe=True)
 def tag(repo, subset, x):
 """The specified tag by name, or all tagged revisions if no name is given.
 If `name` starts with `re:`, the remainder of the name is treated as
 a regular expression. To match a tag that actually starts with `re:`,
 s = set([cl.rev(n) for t, n in repo.tagslist() if matcher(t)])
 else:
 s = set([cl.rev(n) for t, n in repo.tagslist() if t != 'tip'])
 return subset & s
-@predicate('tagged')
+@predicate('tagged', safe=True)
 def tagged(repo, subset, x):
 return tag(repo, subset, x)
-@predicate('unstable()')
+@predicate('unstable()', safe=True)
 def unstable(repo, subset, x):
 """Non-obsolete changesets with obsolete ancestors.
 """
 # i18n: "unstable" is a keyword
 getargs(x, 0, 0, _("unstable takes no arguments"))
 unstables = obsmod.getrevs(repo, 'unstable')
 return subset & unstables
-@predicate('user(string)')
+@predicate('user(string)', safe=True)
 def user(repo, subset, x):
 """User name contains string. The match is case-insensitive.
 If `string` starts with `re:`, the remainder of the string is treated as
 a regular expression. To match a user that actually contains `re:`, use
 the prefix `literal:`.
 """
 return author(repo, subset, x)
 # experimental
-@predicate('wdir')
+@predicate('wdir', safe=True)
 def wdir(repo, subset, x):
 # i18n: "wdir" is a keyword
 getargs(x, 0, 0, _("wdir takes no arguments"))
 if node.wdirrev in subset or isinstance(subset, fullreposet):
 return baseset([node.wdirrev])
 return baseset()
 # for internal use
-@predicate('_list')
+@predicate('_list', safe=True)
 def _list(repo, subset, x):
 s = getstring(x, "internal error")
 if not s:
 return baseset()
 # remove duplicates here. it's difficult for caller to deduplicate sets
 ls.append(r)
 seen.add(r)
 return baseset(ls)
 # for internal use
-@predicate('_intlist')
+@predicate('_intlist', safe=True)
 def _intlist(repo, subset, x):
 s = getstring(x, "internal error")
 if not s:
 return baseset()
 ls = [int(r) for r in s.split('\0')]
 s = subset
 return baseset([r for r in ls if r in s])
 # for internal use
-@predicate('_hexlist')
+@predicate('_hexlist', safe=True)
 def _hexlist(repo, subset, x):
 s = getstring(x, "internal error")
 if not s:
 return baseset()
 cl = repo.changelog
 ls = [cl.rev(node.bin(r)) for r in s.split('\0')]
 s = subset
 return baseset([r for r in ls if r in s])
-# symbols which can't be used for a DoS attack for any given input
-# (e.g. those which accept regexes as plain strings shouldn't be included)
-# functions that just return a lot of changesets (like all) don't count here
-safesymbols = set([
-"adds",
-"all",
-"ancestor",
-"ancestors",
-"_firstancestors",
-"author",
-"bisect",
-"bisected",
-"bookmark",
-"branch",
-"branchpoint",
-"bumped",
-"bundle",
-"children",
-"closed",
-"converted",
-"date",
-"desc",
-"descendants",
-"_firstdescendants",
-"destination",
-"divergent",
-"draft",
-"extinct",
-"extra",
-"file",
-"filelog",
-"first",
-"follow",
-"_followfirst",
-"head",
-"heads",
-"hidden",
-"id",
-"keyword",
-"last",
-"limit",
-"_matchfiles",
-"max",
-"merge",
-"min",
-"modifies",
-"obsolete",
-"only",
-"origin",
-"outgoing",
-"p1",
-"p2",
-"parents",
-"present",
-"public",
-"_notpublic",
-"remote",
-"removes",
-"rev",
-"reverse",
-"roots",
-"sort",
-"secret",
-"matching",
-"tag",
-"tagged",
-"user",
-"unstable",
-"wdir",
-"_list",
-"_intlist",
-"_hexlist",
-])
 methods = {
 "range": rangeset,
 "dagrange": dagrange,
 "string": stringset,

Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/revset.py @ 27587:c8dc480142a8