# HG changeset patch # User Boris Feld # Date 2019-01-04 04:26:13 # Node ID 73203cdfe3fee6b0ba03fbc5c38135cca9eb024d # Parent 8d26026b333504cd24b627102ab9b8052d1690c0 revset: detect integer list on parsing Right now, using "%ld" with `repo.revs("…%ld…", somerevs)` is very inefficient, all items in `somerevs` will be serialized to ascii and then reparsed as integers. If `somerevs` contains just an handful of entry this is fine, however, when you get to thousands or hundreds of thousands of revisions this becomes very slow. To avoid this serialization we need to first detect this situation. The code involved in the whole process is quite complex so we start simple and focus on some "simple" but widespread cases. So far we only detect the situation and don't do anything special about it. The singled out will be serialized in `formatspec` in the same way as before. diff --git a/mercurial/revsetlang.py b/mercurial/revsetlang.py --- a/mercurial/revsetlang.py +++ b/mercurial/revsetlang.py @@ -15,6 +15,7 @@ from . import ( node, parser, pycompat, + smartset, util, ) from .utils import ( @@ -682,6 +683,10 @@ def formatspec(expr, *args): for t, arg in parsed: if t is None: ret.append(arg) + elif t == 'baseset': + if isinstance(arg, set): + arg = sorted(arg) + ret.append(_formatintlist(list(arg))) else: raise error.ProgrammingError("unknown revspec item type: %r" % t) return b''.join(ret) @@ -692,7 +697,8 @@ def _parseargs(expr, args): return a list of tuple [(arg-type, arg-value)] Arg-type can be: - * None: a string ready to be concatenated into a final spec + * None: a string ready to be concatenated into a final spec + * 'baseset': an iterable of revisions """ expr = pycompat.bytestr(expr) argiter = iter(args) @@ -722,10 +728,25 @@ def _parseargs(expr, args): if f: # a list of some type, might be expensive, do not replace pos += 1 + islist = (d == 'l') try: d = expr[pos] except IndexError: raise error.ParseError(_('incomplete revspec format character')) + if islist and d == 'd' and arg: + # special case, we might be able to speedup the list of int case + # + # We have been very conservative here for the first version. + # Other types (eg: generator) are probably fine, but we did not + # wanted to take any risk> + safeinputtype = (list, tuple, set, smartset.abstractsmartset) + if isinstance(arg, safeinputtype): + # we don't create a baseset yet, because it come with an + # extra cost. If we are going to serialize it we better + # skip it. + ret.append(('baseset', arg)) + pos += 1 + continue try: ret.append((None, f(list(arg), d))) except (TypeError, ValueError):