[PATCH] revset: cache alias expansions
Patrick Mezard
patrick at mezard.eu
Thu May 24 06:49:49 CDT 2012
# HG changeset patch
# User Patrick Mezard <patrick at mezard.eu>
# Date 1337857506 -7200
# Node ID f5171e8248a20b23f0404a6f41c1c88390060e60
# Parent 2ac08d8b21aa7b6e0a062afed5a3f357ccef67f9
revset: cache alias expansions
Caching has no performance effect on the revset aliases which triggered
the recent recursive evaluation bug. I wrote it not to feel bad about
expanding several times the same complicated expression.
diff --git a/mercurial/revset.py b/mercurial/revset.py
--- a/mercurial/revset.py
+++ b/mercurial/revset.py
@@ -1387,7 +1387,7 @@
return args[arg]
return tuple(_expandargs(t, args) for t in tree)
-def _expandaliases(aliases, tree, expanding):
+def _expandaliases(aliases, tree, expanding, cache):
"""Expand aliases in tree, recursively.
'aliases' is a dictionary mapping user defined aliases to
@@ -1402,17 +1402,20 @@
raise error.ParseError(_('infinite expansion of revset alias "%s" '
'detected') % alias.name)
expanding.append(alias)
- result = _expandaliases(aliases, alias.replacement, expanding)
+ if alias.name not in cache:
+ cache[alias.name] = _expandaliases(aliases, alias.replacement,
+ expanding, cache)
+ result = cache[alias.name]
expanding.pop()
if alias.args is not None:
l = getlist(tree[2])
if len(l) != len(alias.args):
raise error.ParseError(
_('invalid number of arguments: %s') % len(l))
- l = [_expandaliases(aliases, a, []) for a in l]
+ l = [_expandaliases(aliases, a, [], cache) for a in l]
result = _expandargs(result, dict(zip(alias.args, l)))
else:
- result = tuple(_expandaliases(aliases, t, expanding)
+ result = tuple(_expandaliases(aliases, t, expanding, cache)
for t in tree)
return result
@@ -1422,7 +1425,7 @@
for k, v in ui.configitems('revsetalias'):
alias = revsetalias(k, v)
aliases[alias.name] = alias
- return _expandaliases(aliases, tree, [])
+ return _expandaliases(aliases, tree, [], {})
parse = parser.parser(tokenize, elements).parse
More information about the Mercurial-devel
mailing list