Mercurial > public > mercurial-scm > hg-stable
annotate mercurial/revset.py @ 11280:a5eb0bf7e158
revset: add tagged predicate
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 03 Jun 2010 17:39:40 -0500 |
| parents | 62ccf4cd6e7f |
| children | e581f3acc338 |
| rev | line source |
|---|---|
| 11275 | 1 # revset.py - revision set queries for mercurial |
| 2 # | |
| 3 # Copyright 2010 Matt Mackall <mpm@selenic.com> | |
| 4 # | |
| 5 # This software may be used and distributed according to the terms of the | |
| 6 # GNU General Public License version 2 or any later version. | |
| 7 | |
| 8 import re | |
| 9 import parser, util, hg | |
| 10 import match as _match | |
| 11 | |
| 12 elements = { | |
| 13 "(": (20, ("group", 1, ")"), ("func", 1, ")")), | |
| 14 "-": (19, ("negate", 19), ("minus", 19)), | |
|
11278
7df88cdf47fd
revset: add support for prefix and suffix versions of : and ::
Matt Mackall <mpm@selenic.com>
parents:
11275
diff
changeset
|
15 "::": (17, ("dagrangepre", 17), ("dagrange", 17), |
|
7df88cdf47fd
revset: add support for prefix and suffix versions of : and ::
Matt Mackall <mpm@selenic.com>
parents:
11275
diff
changeset
|
16 ("dagrangepost", 17)), |
|
7df88cdf47fd
revset: add support for prefix and suffix versions of : and ::
Matt Mackall <mpm@selenic.com>
parents:
11275
diff
changeset
|
17 "..": (17, ("dagrangepre", 17), ("dagrange", 17), |
|
7df88cdf47fd
revset: add support for prefix and suffix versions of : and ::
Matt Mackall <mpm@selenic.com>
parents:
11275
diff
changeset
|
18 ("dagrangepost", 17)), |
|
7df88cdf47fd
revset: add support for prefix and suffix versions of : and ::
Matt Mackall <mpm@selenic.com>
parents:
11275
diff
changeset
|
19 ":": (15, ("rangepre", 15), ("range", 15), ("rangepost", 15)), |
| 11275 | 20 "not": (10, ("not", 10)), |
| 21 "!": (10, ("not", 10)), | |
| 22 "and": (5, None, ("and", 5)), | |
| 23 "&": (5, None, ("and", 5)), | |
| 24 "or": (4, None, ("or", 4)), | |
| 25 "|": (4, None, ("or", 4)), | |
| 26 "+": (4, None, ("or", 4)), | |
| 27 ",": (2, None, ("list", 2)), | |
| 28 ")": (0, None, None), | |
| 29 "symbol": (0, ("symbol",), None), | |
| 30 "string": (0, ("string",), None), | |
| 31 "end": (0, None, None), | |
| 32 } | |
| 33 | |
| 34 keywords = set(['and', 'or', 'not']) | |
| 35 | |
| 36 def tokenize(program): | |
| 37 pos, l = 0, len(program) | |
| 38 while pos < l: | |
| 39 c = program[pos] | |
| 40 if c.isspace(): # skip inter-token whitespace | |
| 41 pass | |
|
11278
7df88cdf47fd
revset: add support for prefix and suffix versions of : and ::
Matt Mackall <mpm@selenic.com>
parents:
11275
diff
changeset
|
42 elif c == ':' and program[pos:pos + 2] == '::': # look ahead carefully |
|
7df88cdf47fd
revset: add support for prefix and suffix versions of : and ::
Matt Mackall <mpm@selenic.com>
parents:
11275
diff
changeset
|
43 yield ('::', None) |
|
7df88cdf47fd
revset: add support for prefix and suffix versions of : and ::
Matt Mackall <mpm@selenic.com>
parents:
11275
diff
changeset
|
44 pos += 1 # skip ahead |
| 11275 | 45 elif c == '.' and program[pos:pos + 2] == '..': # look ahead carefully |
| 46 yield ('..', None) | |
| 47 pos += 1 # skip ahead | |
|
11278
7df88cdf47fd
revset: add support for prefix and suffix versions of : and ::
Matt Mackall <mpm@selenic.com>
parents:
11275
diff
changeset
|
48 elif c in "():,-|&+!": # handle simple operators |
|
7df88cdf47fd
revset: add support for prefix and suffix versions of : and ::
Matt Mackall <mpm@selenic.com>
parents:
11275
diff
changeset
|
49 yield (c, None) |
| 11275 | 50 elif c in '"\'': # handle quoted strings |
| 51 pos += 1 | |
| 52 s = pos | |
| 53 while pos < l: # find closing quote | |
| 54 d = program[pos] | |
| 55 if d == '\\': # skip over escaped characters | |
| 56 pos += 2 | |
| 57 continue | |
| 58 if d == c: | |
| 59 yield ('string', program[s:pos].decode('string-escape')) | |
| 60 break | |
| 61 pos += 1 | |
| 62 else: | |
| 63 raise "unterminated string" | |
| 64 elif c.isalnum() or c in '.': # gather up a symbol/keyword | |
| 65 s = pos | |
| 66 pos += 1 | |
| 67 while pos < l: # find end of symbol | |
| 68 d = program[pos] | |
| 69 if not (d.isalnum() or d in "._"): | |
| 70 break | |
| 71 if d == '.' and program[pos - 1] == '.': # special case for .. | |
| 72 pos -= 1 | |
| 73 break | |
| 74 pos += 1 | |
| 75 sym = program[s:pos] | |
| 76 if sym in keywords: # operator keywords | |
| 77 yield (sym, None) | |
| 78 else: | |
| 79 yield ('symbol', sym) | |
| 80 pos -= 1 | |
| 81 else: | |
| 82 raise "syntax error at %d" % pos | |
| 83 pos += 1 | |
| 84 yield ('end', None) | |
| 85 | |
| 86 # helpers | |
| 87 | |
| 88 def getstring(x, err): | |
| 89 if x[0] == 'string' or x[0] == 'symbol': | |
| 90 return x[1] | |
| 91 raise err | |
| 92 | |
| 93 def getlist(x): | |
| 94 if not x: | |
| 95 return [] | |
| 96 if x[0] == 'list': | |
| 97 return getlist(x[1]) + [x[2]] | |
| 98 return [x] | |
| 99 | |
| 100 def getpair(x, err): | |
| 101 l = getlist(x) | |
| 102 if len(l) != 2: | |
| 103 raise err | |
| 104 return l | |
| 105 | |
| 106 def getset(repo, subset, x): | |
| 107 if not x: | |
| 108 raise "missing argument" | |
| 109 return methods[x[0]](repo, subset, *x[1:]) | |
| 110 | |
| 111 # operator methods | |
| 112 | |
| 113 def negate(repo, subset, x): | |
| 114 return getset(repo, subset, | |
| 115 ('string', '-' + getstring(x, "can't negate that"))) | |
| 116 | |
| 117 def stringset(repo, subset, x): | |
| 118 x = repo[x].rev() | |
| 119 if x in subset: | |
| 120 return [x] | |
| 121 return [] | |
| 122 | |
| 123 def symbolset(repo, subset, x): | |
| 124 if x in symbols: | |
| 125 raise "can't use %s here" % x | |
| 126 return stringset(repo, subset, x) | |
| 127 | |
| 128 def rangeset(repo, subset, x, y): | |
| 129 m = getset(repo, subset, x)[0] | |
| 130 n = getset(repo, subset, y)[-1] | |
| 131 if m < n: | |
| 132 return range(m, n + 1) | |
| 133 return range(m, n - 1, -1) | |
| 134 | |
| 135 def andset(repo, subset, x, y): | |
| 136 return getset(repo, getset(repo, subset, x), y) | |
| 137 | |
| 138 def orset(repo, subset, x, y): | |
| 139 s = set(getset(repo, subset, x)) | |
| 140 s |= set(getset(repo, [r for r in subset if r not in s], y)) | |
| 141 return [r for r in subset if r in s] | |
| 142 | |
| 143 def notset(repo, subset, x): | |
| 144 s = set(getset(repo, subset, x)) | |
| 145 return [r for r in subset if r not in s] | |
| 146 | |
| 147 def listset(repo, subset, a, b): | |
| 148 raise "can't use a list in this context" | |
| 149 | |
| 150 def func(repo, subset, a, b): | |
| 151 if a[0] == 'symbol' and a[1] in symbols: | |
| 152 return symbols[a[1]](repo, subset, b) | |
| 153 raise "that's not a function: %s" % a[1] | |
| 154 | |
| 155 # functions | |
| 156 | |
| 157 def p1(repo, subset, x): | |
| 158 ps = set() | |
| 159 cl = repo.changelog | |
| 160 for r in getset(repo, subset, x): | |
| 161 ps.add(cl.parentrevs(r)[0]) | |
| 162 return [r for r in subset if r in ps] | |
| 163 | |
| 164 def p2(repo, subset, x): | |
| 165 ps = set() | |
| 166 cl = repo.changelog | |
| 167 for r in getset(repo, subset, x): | |
| 168 ps.add(cl.parentrevs(r)[1]) | |
| 169 return [r for r in subset if r in ps] | |
| 170 | |
| 171 def parents(repo, subset, x): | |
| 172 ps = set() | |
| 173 cl = repo.changelog | |
| 174 for r in getset(repo, subset, x): | |
| 175 ps.update(cl.parentrevs(r)) | |
| 176 return [r for r in subset if r in ps] | |
| 177 | |
| 178 def maxrev(repo, subset, x): | |
| 179 s = getset(repo, subset, x) | |
| 180 if s: | |
| 181 m = max(s) | |
| 182 if m in subset: | |
| 183 return [m] | |
| 184 return [] | |
| 185 | |
| 186 def limit(repo, subset, x): | |
| 187 l = getpair(x, "limit wants two args") | |
| 188 try: | |
| 189 lim = int(getstring(l[1], "limit wants a number")) | |
| 190 except ValueError: | |
| 191 raise "wants a number" | |
| 192 return getset(repo, subset, l[0])[:lim] | |
| 193 | |
| 194 def children(repo, subset, x): | |
| 195 cs = set() | |
| 196 cl = repo.changelog | |
| 197 s = set(getset(repo, subset, x)) | |
| 198 for r in xrange(0, len(repo)): | |
| 199 for p in cl.parentrevs(r): | |
| 200 if p in s: | |
| 201 cs.add(r) | |
| 202 return [r for r in subset if r in cs] | |
| 203 | |
| 204 def branch(repo, subset, x): | |
| 205 s = getset(repo, range(len(repo)), x) | |
| 206 b = set() | |
| 207 for r in s: | |
| 208 b.add(repo[r].branch()) | |
| 209 s = set(s) | |
| 210 return [r for r in subset if r in s or repo[r].branch() in b] | |
| 211 | |
| 212 def ancestor(repo, subset, x): | |
| 213 l = getpair(x, "ancestor wants two args") | |
| 214 a = getset(repo, subset, l[0]) | |
| 215 b = getset(repo, subset, l[1]) | |
| 216 if len(a) > 1 or len(b) > 1: | |
| 217 raise "arguments to ancestor must be single revisions" | |
| 218 return [repo[a[0]].ancestor(repo[b[0]]).rev()] | |
| 219 | |
| 220 def ancestors(repo, subset, x): | |
| 221 args = getset(repo, range(len(repo)), x) | |
| 222 s = set(repo.changelog.ancestors(*args)) | set(args) | |
| 223 return [r for r in subset if r in s] | |
| 224 | |
| 225 def descendants(repo, subset, x): | |
| 226 args = getset(repo, range(len(repo)), x) | |
| 227 s = set(repo.changelog.descendants(*args)) | set(args) | |
| 228 return [r for r in subset if r in s] | |
| 229 | |
| 230 def follow(repo, subset, x): | |
| 231 if x: | |
| 232 raise "follow takes no args" | |
| 233 p = repo['.'].rev() | |
| 234 s = set(repo.changelog.ancestors(p)) | set([p]) | |
| 235 return [r for r in subset if r in s] | |
| 236 | |
| 237 def date(repo, subset, x): | |
| 238 ds = getstring(x, 'date wants a string') | |
| 239 dm = util.matchdate(ds) | |
| 240 return [r for r in subset if dm(repo[r].date()[0])] | |
| 241 | |
| 242 def keyword(repo, subset, x): | |
| 243 kw = getstring(x, "keyword wants a string").lower() | |
| 244 l = [] | |
| 245 for r in subset: | |
| 246 c = repo[r] | |
| 247 t = " ".join(c.files() + [c.user(), c.description()]) | |
| 248 if kw in t.lower(): | |
| 249 l.append(r) | |
| 250 return l | |
| 251 | |
| 252 def grep(repo, subset, x): | |
| 253 gr = re.compile(getstring(x, "grep wants a string")) | |
| 254 l = [] | |
| 255 for r in subset: | |
| 256 c = repo[r] | |
| 257 for e in c.files() + [c.user(), c.description()]: | |
| 258 if gr.search(e): | |
| 259 l.append(r) | |
| 260 continue | |
| 261 return l | |
| 262 | |
| 263 def author(repo, subset, x): | |
| 264 n = getstring(x, "author wants a string").lower() | |
| 265 return [r for r in subset if n in repo[r].user().lower()] | |
| 266 | |
| 267 def hasfile(repo, subset, x): | |
| 268 pat = getstring(x, "file wants a pattern") | |
| 269 m = _match.match(repo.root, repo.getcwd(), [pat]) | |
| 270 s = [] | |
| 271 for r in subset: | |
| 272 for f in repo[r].files(): | |
| 273 if m(f): | |
| 274 s.append(r) | |
| 275 continue | |
| 276 return s | |
| 277 | |
| 278 def contains(repo, subset, x): | |
| 279 pat = getstring(x, "file wants a pattern") | |
| 280 m = _match.match(repo.root, repo.getcwd(), [pat]) | |
| 281 s = [] | |
| 282 if m.files() == [pat]: | |
| 283 for r in subset: | |
| 284 if pat in repo[r]: | |
| 285 s.append(r) | |
| 286 continue | |
| 287 else: | |
| 288 for r in subset: | |
| 289 c = repo[r] | |
| 290 for f in repo[r].manifest(): | |
| 291 if m(f): | |
| 292 s.append(r) | |
| 293 continue | |
| 294 return s | |
| 295 | |
| 296 def checkstatus(repo, subset, pat, field): | |
| 297 m = _match.match(repo.root, repo.getcwd(), [pat]) | |
| 298 s = [] | |
| 299 fast = (m.files() == [pat]) | |
| 300 for r in subset: | |
| 301 c = repo[r] | |
| 302 if fast: | |
| 303 if pat not in c.files(): | |
| 304 continue | |
| 305 else: | |
| 306 for f in c.files(): | |
| 307 if m(f): | |
| 308 break | |
| 309 else: | |
| 310 continue | |
| 311 files = repo.status(c.p1().node(), c.node())[field] | |
| 312 if fast: | |
| 313 if pat in files: | |
| 314 s.append(r) | |
| 315 continue | |
| 316 else: | |
| 317 for f in files: | |
| 318 if m(f): | |
| 319 s.append(r) | |
| 320 continue | |
| 321 return s | |
| 322 | |
| 323 def modifies(repo, subset, x): | |
| 324 pat = getstring(x, "modifies wants a pattern") | |
| 325 return checkstatus(repo, subset, pat, 0) | |
| 326 | |
| 327 def adds(repo, subset, x): | |
| 328 pat = getstring(x, "adds wants a pattern") | |
| 329 return checkstatus(repo, subset, pat, 1) | |
| 330 | |
| 331 def removes(repo, subset, x): | |
| 332 pat = getstring(x, "removes wants a pattern") | |
| 333 return checkstatus(repo, subset, pat, 2) | |
| 334 | |
| 335 def merge(repo, subset, x): | |
| 336 if x: | |
| 337 raise "merge takes no args" | |
| 338 cl = repo.changelog | |
| 339 return [r for r in subset if cl.parentrevs(r)[1] != -1] | |
| 340 | |
| 341 def closed(repo, subset, x): | |
| 342 return [r for r in subset if repo[r].extra('close')] | |
| 343 | |
| 344 def head(repo, subset, x): | |
| 345 hs = set() | |
| 346 for b, ls in repo.branchmap().iteritems(): | |
| 347 hs.update(repo[h].rev() for h in ls) | |
| 348 return [r for r in subset if r in hs] | |
| 349 | |
| 350 def reverse(repo, subset, x): | |
| 351 l = getset(repo, subset, x) | |
| 352 l.reverse() | |
| 353 return l | |
| 354 | |
| 355 def sort(repo, subset, x): | |
| 356 l = getlist(x) | |
| 357 keys = "rev" | |
| 358 if len(l) == 2: | |
| 359 keys = getstring(l[1], "sort spec must be a string") | |
| 360 | |
| 361 s = l[0] | |
| 362 keys = keys.split() | |
| 363 l = [] | |
| 364 def invert(s): | |
| 365 return "".join(chr(255 - ord(c)) for c in s) | |
| 366 for r in getset(repo, subset, s): | |
| 367 c = repo[r] | |
| 368 e = [] | |
| 369 for k in keys: | |
| 370 if k == 'rev': | |
| 371 e.append(r) | |
| 372 elif k == '-rev': | |
| 373 e.append(-r) | |
| 374 elif k == 'branch': | |
| 375 e.append(c.branch()) | |
| 376 elif k == '-branch': | |
| 377 e.append(invert(c.branch())) | |
| 378 elif k == 'desc': | |
| 379 e.append(c.description()) | |
| 380 elif k == '-desc': | |
| 381 e.append(invert(c.description())) | |
| 382 elif k in 'user author': | |
| 383 e.append(c.user()) | |
| 384 elif k in '-user -author': | |
| 385 e.append(invert(c.user())) | |
| 386 elif k == 'date': | |
| 387 e.append(c.date()[0]) | |
| 388 elif k == '-date': | |
| 389 e.append(-c.date()[0]) | |
| 390 else: | |
| 391 raise "unknown sort key %r" % k | |
| 392 e.append(r) | |
| 393 l.append(e) | |
| 394 l.sort() | |
| 395 return [e[-1] for e in l] | |
| 396 | |
| 397 def getall(repo, subset, x): | |
| 398 return subset | |
| 399 | |
| 400 def heads(repo, subset, x): | |
| 401 s = getset(repo, subset, x) | |
| 402 ps = set(parents(repo, subset, x)) | |
| 403 return [r for r in s if r not in ps] | |
| 404 | |
| 405 def roots(repo, subset, x): | |
| 406 s = getset(repo, subset, x) | |
| 407 cs = set(children(repo, subset, x)) | |
| 408 return [r for r in s if r not in cs] | |
| 409 | |
| 410 def outgoing(repo, subset, x): | |
| 411 l = getlist(x) | |
| 412 if len(l) == 1: | |
| 413 dest = getstring(l[0], "outgoing wants a repo path") | |
| 414 else: | |
| 415 dest = '' | |
| 416 dest = repo.ui.expandpath(dest or 'default-push', dest or 'default') | |
| 417 dest, branches = hg.parseurl(dest) | |
| 418 other = hg.repository(hg.remoteui(repo, {}), dest) | |
| 419 repo.ui.pushbuffer() | |
| 420 o = repo.findoutgoing(other) | |
| 421 repo.ui.popbuffer() | |
| 422 cl = repo.changelog | |
| 423 o = set([cl.rev(r) for r in repo.changelog.nodesbetween(o, None)[0]]) | |
| 424 print 'out', dest, o | |
| 425 return [r for r in subset if r in o] | |
| 426 | |
|
11280
a5eb0bf7e158
revset: add tagged predicate
Matt Mackall <mpm@selenic.com>
parents:
11279
diff
changeset
|
427 def tagged(repo, subset, x): |
|
a5eb0bf7e158
revset: add tagged predicate
Matt Mackall <mpm@selenic.com>
parents:
11279
diff
changeset
|
428 cl = repo.changelog |
|
a5eb0bf7e158
revset: add tagged predicate
Matt Mackall <mpm@selenic.com>
parents:
11279
diff
changeset
|
429 s = set([cl.rev(n) for t, n in repo.tagslist() if t != 'tip']) |
|
a5eb0bf7e158
revset: add tagged predicate
Matt Mackall <mpm@selenic.com>
parents:
11279
diff
changeset
|
430 return [r for r in subset if r in s] |
|
a5eb0bf7e158
revset: add tagged predicate
Matt Mackall <mpm@selenic.com>
parents:
11279
diff
changeset
|
431 |
| 11275 | 432 symbols = { |
| 433 "ancestor": ancestor, | |
| 434 "ancestors": ancestors, | |
| 435 "descendants": descendants, | |
| 436 "follow": follow, | |
| 437 "merge": merge, | |
| 438 "reverse": reverse, | |
| 439 "sort": sort, | |
| 440 "branch": branch, | |
| 441 "keyword": keyword, | |
| 442 "author": author, | |
| 443 "user": author, | |
| 444 "date": date, | |
| 445 "grep": grep, | |
| 446 "p1": p1, | |
| 447 "p2": p2, | |
| 448 "parents": parents, | |
| 449 "children": children, | |
| 450 "max": maxrev, | |
| 451 "limit": limit, | |
| 452 "file": hasfile, | |
| 453 "contains": contains, | |
| 454 "heads": heads, | |
| 455 "roots": roots, | |
| 456 "all": getall, | |
| 457 "closed": closed, | |
| 458 "head": head, | |
| 459 "modifies": modifies, | |
| 460 "adds": adds, | |
| 461 "removes": removes, | |
| 462 "outgoing": outgoing, | |
|
11280
a5eb0bf7e158
revset: add tagged predicate
Matt Mackall <mpm@selenic.com>
parents:
11279
diff
changeset
|
463 "tagged": tagged, |
| 11275 | 464 } |
| 465 | |
| 466 methods = { | |
| 467 "negate": negate, | |
| 468 "range": rangeset, | |
| 469 "string": stringset, | |
| 470 "symbol": symbolset, | |
| 471 "and": andset, | |
| 472 "or": orset, | |
| 473 "not": notset, | |
| 474 "list": listset, | |
| 475 "func": func, | |
| 476 } | |
| 477 | |
|
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
478 def optimize(x, small): |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
479 if x == None: |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
480 return 0, x |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
481 |
| 11275 | 482 smallbonus = 1 |
| 483 if small: | |
| 484 smallbonus = .5 | |
| 485 | |
| 486 op = x[0] | |
|
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
487 if op == '-': |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
488 return optimize(('and', x[1], ('not', x[2])), small) |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
489 elif op == 'dagrange': |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
490 return optimize(('and', ('func', ('symbol', 'descendants'), x[1]), |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
491 ('func', ('symbol', 'ancestors'), x[2])), small) |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
492 elif op == 'dagrangepre': |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
493 return optimize(('func', ('symbol', 'ancestors'), x[1]), small) |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
494 elif op == 'dagrangepost': |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
495 return optimize(('func', ('symbol', 'descendants'), x[1]), small) |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
496 elif op == 'rangepre': |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
497 return optimize(('range', ('string', '0'), x[1]), small) |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
498 elif op == 'rangepost': |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
499 return optimize(('range', x[1], ('string', 'tip')), small) |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
500 elif op in 'string symbol negate': |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
501 return smallbonus, x # single revisions are small |
| 11275 | 502 elif op == 'and' or op == 'dagrange': |
|
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
503 wa, ta = optimize(x[1], True) |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
504 wb, tb = optimize(x[2], True) |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
505 w = min(wa, wb) |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
506 if wa > wb: |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
507 return w, (op, tb, ta) |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
508 return w, (op, ta, tb) |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
509 elif op == 'or': |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
510 wa, ta = optimize(x[1], False) |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
511 wb, tb = optimize(x[2], False) |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
512 if wb < wa: |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
513 wb, wa = wa, wb |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
514 return max(wa, wb), (op, ta, tb) |
| 11275 | 515 elif op == 'not': |
|
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
516 o = optimize(x[1], not small) |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
517 return o[0], (op, o[1]) |
| 11275 | 518 elif op == 'group': |
|
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
519 return optimize(x[1], small) |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
520 elif op in 'rangepre rangepost dagrangepre dagrangepost': |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
521 wa, ta = optimize(x[1], small) |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
522 return wa + 1, (op, ta) |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
523 elif op in 'range list': |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
524 wa, ta = optimize(x[1], small) |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
525 wb, tb = optimize(x[2], small) |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
526 return wa + wb, (op, ta, tb) |
| 11275 | 527 elif op == 'func': |
| 528 f = getstring(x[1], "not a symbol") | |
|
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
529 wa, ta = optimize(x[2], small) |
| 11275 | 530 if f in "grep date user author keyword branch file": |
|
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
531 w = 10 # slow |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
532 elif f in "modifies adds removes outgoing": |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
533 w = 30 # slower |
| 11275 | 534 elif f == "contains": |
|
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
535 w = 100 # very slow |
| 11275 | 536 elif f == "ancestor": |
|
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
537 w = 1 * smallbonus |
| 11275 | 538 elif f == "reverse limit": |
|
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
539 w = 0 |
| 11275 | 540 elif f in "sort": |
|
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
541 w = 10 # assume most sorts look at changelog |
| 11275 | 542 else: |
|
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
543 w = 1 |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
544 return w + wa, (op, x[1], ta) |
|
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
545 return 1, x |
| 11275 | 546 |
| 547 parse = parser.parser(tokenize, elements).parse | |
| 548 | |
| 549 def match(spec): | |
| 550 tree = parse(spec) | |
|
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
551 weight, tree = optimize(tree, True) |
| 11275 | 552 def mfunc(repo, subset): |
| 553 return getset(repo, subset, tree) | |
| 554 return mfunc |