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

merge with stable

comparison

equal deleted inserted replaced

-:39f418979059
+:2555f441a32f
 >>> formatspec('%r:: and %lr', '10 or 11', ("this()", "that()"))
 '(10 or 11):: and ((this()) or (that()))'
 >>> formatspec('%d:: and not %d::', 10, 20)
 '10:: and not 20::'
 >>> formatspec('%ld or %ld', [], [1])
-'(0-0) or (1)'
+'(0-0) or 1'
 >>> formatspec('keyword(%s)', 'foo\\xe9')
 "keyword('foo\\\\xe9')"
 >>> b = lambda: 'default'
 >>> b.branch = b
 >>> formatspec('branch(%b)', b)
 "branch('default')"
 >>> formatspec('root(%ls)', ['a', 'b', 'c', 'd'])
-"root(('a' or 'b' or 'c' or 'd'))"
+"root((('a' or 'b') or ('c' or 'd')))"
 '''
 def quote(s):
 return repr(str(s))
 return '(%s)' % arg
 elif c == 'n':
 return quote(nodemod.hex(arg))
 elif c == 'b':
 return quote(arg.branch())
+def listexp(s, t):
+"balance a list s of type t to limit parse tree depth"
+l = len(s)
+if l == 0:
+return '(0-0)' # a minimal way to represent an empty set
+if l == 1:
+return argtype(t, s[0])
+m = l / 2
+return '(%s or %s)' % (listexp(s[:m], t), listexp(s[m:], t))
 ret = ''
 pos = 0
 arg = 0
 while pos < len(expr):
 arg += 1
 elif d == 'l':
 # a list of some type
 pos += 1
 d = expr[pos]
-if args[arg]:
+ret += listexp(list(args[arg]), d)
-lv = ' or '.join(argtype(d, e) for e in args[arg])
-else:
-lv = '0-0' # a minimal way to represent an empty set
-ret += '(%s)' % lv
 arg += 1
 else:
 raise util.Abort('unexpected revspec format character %s' % d)
 else:
 ret += c

Mercurial > public > mercurial-scm > hg-stable