Mercurial > hg-stable
annotate mercurial/revset.py @ 11301:3d0591a66118
move discovery methods from localrepo into new discovery module
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Mon, 07 Jun 2010 18:35:54 +0200 |
parents | 0e5ce2325795 |
children | 8c377f2feee1 |
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 | |
11301
3d0591a66118
move discovery methods from localrepo into new discovery module
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
11293
diff
changeset
|
9 import parser, util, error, discovery |
11275 | 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 |
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
43 yield ('::', None, pos) |
11278
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 |
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
46 yield ('..', None, pos) |
11275 | 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 |
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
49 yield (c, None, pos) |
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: | |
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
59 yield ('string', program[s:pos].decode('string-escape'), s) |
11275 | 60 break |
61 pos += 1 | |
62 else: | |
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
63 raise error.ParseError("unterminated string", s) |
11275 | 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 | |
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
77 yield (sym, None, s) |
11275 | 78 else: |
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
79 yield ('symbol', sym, s) |
11275 | 80 pos -= 1 |
81 else: | |
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
82 raise error.ParseError("syntax error", pos) |
11275 | 83 pos += 1 |
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
84 yield ('end', None, pos) |
11275 | 85 |
86 # helpers | |
87 | |
88 def getstring(x, err): | |
89 if x[0] == 'string' or x[0] == 'symbol': | |
90 return x[1] | |
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
91 raise error.ParseError(err) |
11275 | 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: | |
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
103 raise error.ParseError(err) |
11275 | 104 return l |
105 | |
106 def getset(repo, subset, x): | |
107 if not x: | |
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
108 raise error.ParseError("missing argument") |
11275 | 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() | |
11282 | 119 if x == -1 and len(subset) == len(repo): |
120 return [-1] | |
11275 | 121 if x in subset: |
122 return [x] | |
123 return [] | |
124 | |
125 def symbolset(repo, subset, x): | |
126 if x in symbols: | |
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
127 raise error.ParseError("can't use %s here" % x) |
11275 | 128 return stringset(repo, subset, x) |
129 | |
130 def rangeset(repo, subset, x, y): | |
131 m = getset(repo, subset, x)[0] | |
132 n = getset(repo, subset, y)[-1] | |
133 if m < n: | |
134 return range(m, n + 1) | |
135 return range(m, n - 1, -1) | |
136 | |
137 def andset(repo, subset, x, y): | |
138 return getset(repo, getset(repo, subset, x), y) | |
139 | |
140 def orset(repo, subset, x, y): | |
141 s = set(getset(repo, subset, x)) | |
142 s |= set(getset(repo, [r for r in subset if r not in s], y)) | |
143 return [r for r in subset if r in s] | |
144 | |
145 def notset(repo, subset, x): | |
146 s = set(getset(repo, subset, x)) | |
147 return [r for r in subset if r not in s] | |
148 | |
149 def listset(repo, subset, a, b): | |
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
150 raise error.ParseError("can't use a list in this context") |
11275 | 151 |
152 def func(repo, subset, a, b): | |
153 if a[0] == 'symbol' and a[1] in symbols: | |
154 return symbols[a[1]](repo, subset, b) | |
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
155 raise error.ParseError("not a function: %s" % a[1]) |
11275 | 156 |
157 # functions | |
158 | |
159 def p1(repo, subset, x): | |
160 ps = set() | |
161 cl = repo.changelog | |
162 for r in getset(repo, subset, x): | |
163 ps.add(cl.parentrevs(r)[0]) | |
164 return [r for r in subset if r in ps] | |
165 | |
166 def p2(repo, subset, x): | |
167 ps = set() | |
168 cl = repo.changelog | |
169 for r in getset(repo, subset, x): | |
170 ps.add(cl.parentrevs(r)[1]) | |
171 return [r for r in subset if r in ps] | |
172 | |
173 def parents(repo, subset, x): | |
174 ps = set() | |
175 cl = repo.changelog | |
176 for r in getset(repo, subset, x): | |
177 ps.update(cl.parentrevs(r)) | |
178 return [r for r in subset if r in ps] | |
179 | |
180 def maxrev(repo, subset, x): | |
181 s = getset(repo, subset, x) | |
182 if s: | |
183 m = max(s) | |
184 if m in subset: | |
185 return [m] | |
186 return [] | |
187 | |
188 def limit(repo, subset, x): | |
189 l = getpair(x, "limit wants two args") | |
190 try: | |
191 lim = int(getstring(l[1], "limit wants a number")) | |
192 except ValueError: | |
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
193 raise error.ParseError("limit expects a number") |
11275 | 194 return getset(repo, subset, l[0])[:lim] |
195 | |
196 def children(repo, subset, x): | |
197 cs = set() | |
198 cl = repo.changelog | |
199 s = set(getset(repo, subset, x)) | |
200 for r in xrange(0, len(repo)): | |
201 for p in cl.parentrevs(r): | |
202 if p in s: | |
203 cs.add(r) | |
204 return [r for r in subset if r in cs] | |
205 | |
206 def branch(repo, subset, x): | |
207 s = getset(repo, range(len(repo)), x) | |
208 b = set() | |
209 for r in s: | |
210 b.add(repo[r].branch()) | |
211 s = set(s) | |
212 return [r for r in subset if r in s or repo[r].branch() in b] | |
213 | |
214 def ancestor(repo, subset, x): | |
215 l = getpair(x, "ancestor wants two args") | |
216 a = getset(repo, subset, l[0]) | |
217 b = getset(repo, subset, l[1]) | |
218 if len(a) > 1 or len(b) > 1: | |
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
219 raise error.ParseError("ancestor args must be single revisions") |
11275 | 220 return [repo[a[0]].ancestor(repo[b[0]]).rev()] |
221 | |
222 def ancestors(repo, subset, x): | |
223 args = getset(repo, range(len(repo)), x) | |
224 s = set(repo.changelog.ancestors(*args)) | set(args) | |
225 return [r for r in subset if r in s] | |
226 | |
227 def descendants(repo, subset, x): | |
228 args = getset(repo, range(len(repo)), x) | |
229 s = set(repo.changelog.descendants(*args)) | set(args) | |
230 return [r for r in subset if r in s] | |
231 | |
232 def follow(repo, subset, x): | |
233 if x: | |
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
234 raise error.ParseError("follow takes no args") |
11275 | 235 p = repo['.'].rev() |
236 s = set(repo.changelog.ancestors(p)) | set([p]) | |
237 return [r for r in subset if r in s] | |
238 | |
239 def date(repo, subset, x): | |
240 ds = getstring(x, 'date wants a string') | |
241 dm = util.matchdate(ds) | |
242 return [r for r in subset if dm(repo[r].date()[0])] | |
243 | |
244 def keyword(repo, subset, x): | |
245 kw = getstring(x, "keyword wants a string").lower() | |
246 l = [] | |
247 for r in subset: | |
248 c = repo[r] | |
249 t = " ".join(c.files() + [c.user(), c.description()]) | |
250 if kw in t.lower(): | |
251 l.append(r) | |
252 return l | |
253 | |
254 def grep(repo, subset, x): | |
255 gr = re.compile(getstring(x, "grep wants a string")) | |
256 l = [] | |
257 for r in subset: | |
258 c = repo[r] | |
259 for e in c.files() + [c.user(), c.description()]: | |
260 if gr.search(e): | |
261 l.append(r) | |
262 continue | |
263 return l | |
264 | |
265 def author(repo, subset, x): | |
266 n = getstring(x, "author wants a string").lower() | |
267 return [r for r in subset if n in repo[r].user().lower()] | |
268 | |
269 def hasfile(repo, subset, x): | |
270 pat = getstring(x, "file wants a pattern") | |
271 m = _match.match(repo.root, repo.getcwd(), [pat]) | |
272 s = [] | |
273 for r in subset: | |
274 for f in repo[r].files(): | |
275 if m(f): | |
276 s.append(r) | |
277 continue | |
278 return s | |
279 | |
280 def contains(repo, subset, x): | |
281 pat = getstring(x, "file wants a pattern") | |
282 m = _match.match(repo.root, repo.getcwd(), [pat]) | |
283 s = [] | |
284 if m.files() == [pat]: | |
285 for r in subset: | |
286 if pat in repo[r]: | |
287 s.append(r) | |
288 continue | |
289 else: | |
290 for r in subset: | |
291 c = repo[r] | |
292 for f in repo[r].manifest(): | |
293 if m(f): | |
294 s.append(r) | |
295 continue | |
296 return s | |
297 | |
298 def checkstatus(repo, subset, pat, field): | |
299 m = _match.match(repo.root, repo.getcwd(), [pat]) | |
300 s = [] | |
301 fast = (m.files() == [pat]) | |
302 for r in subset: | |
303 c = repo[r] | |
304 if fast: | |
305 if pat not in c.files(): | |
306 continue | |
307 else: | |
308 for f in c.files(): | |
309 if m(f): | |
310 break | |
311 else: | |
312 continue | |
313 files = repo.status(c.p1().node(), c.node())[field] | |
314 if fast: | |
315 if pat in files: | |
316 s.append(r) | |
317 continue | |
318 else: | |
319 for f in files: | |
320 if m(f): | |
321 s.append(r) | |
322 continue | |
323 return s | |
324 | |
325 def modifies(repo, subset, x): | |
326 pat = getstring(x, "modifies wants a pattern") | |
327 return checkstatus(repo, subset, pat, 0) | |
328 | |
329 def adds(repo, subset, x): | |
330 pat = getstring(x, "adds wants a pattern") | |
331 return checkstatus(repo, subset, pat, 1) | |
332 | |
333 def removes(repo, subset, x): | |
334 pat = getstring(x, "removes wants a pattern") | |
335 return checkstatus(repo, subset, pat, 2) | |
336 | |
337 def merge(repo, subset, x): | |
338 if x: | |
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
339 raise error.ParseError("merge takes no args") |
11275 | 340 cl = repo.changelog |
341 return [r for r in subset if cl.parentrevs(r)[1] != -1] | |
342 | |
343 def closed(repo, subset, x): | |
344 return [r for r in subset if repo[r].extra('close')] | |
345 | |
346 def head(repo, subset, x): | |
347 hs = set() | |
348 for b, ls in repo.branchmap().iteritems(): | |
349 hs.update(repo[h].rev() for h in ls) | |
350 return [r for r in subset if r in hs] | |
351 | |
352 def reverse(repo, subset, x): | |
353 l = getset(repo, subset, x) | |
354 l.reverse() | |
355 return l | |
356 | |
357 def sort(repo, subset, x): | |
358 l = getlist(x) | |
359 keys = "rev" | |
360 if len(l) == 2: | |
361 keys = getstring(l[1], "sort spec must be a string") | |
362 | |
363 s = l[0] | |
364 keys = keys.split() | |
365 l = [] | |
366 def invert(s): | |
367 return "".join(chr(255 - ord(c)) for c in s) | |
368 for r in getset(repo, subset, s): | |
369 c = repo[r] | |
370 e = [] | |
371 for k in keys: | |
372 if k == 'rev': | |
373 e.append(r) | |
374 elif k == '-rev': | |
375 e.append(-r) | |
376 elif k == 'branch': | |
377 e.append(c.branch()) | |
378 elif k == '-branch': | |
379 e.append(invert(c.branch())) | |
380 elif k == 'desc': | |
381 e.append(c.description()) | |
382 elif k == '-desc': | |
383 e.append(invert(c.description())) | |
384 elif k in 'user author': | |
385 e.append(c.user()) | |
386 elif k in '-user -author': | |
387 e.append(invert(c.user())) | |
388 elif k == 'date': | |
389 e.append(c.date()[0]) | |
390 elif k == '-date': | |
391 e.append(-c.date()[0]) | |
392 else: | |
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
393 raise error.ParseError("unknown sort key %r" % k) |
11275 | 394 e.append(r) |
395 l.append(e) | |
396 l.sort() | |
397 return [e[-1] for e in l] | |
398 | |
399 def getall(repo, subset, x): | |
400 return subset | |
401 | |
402 def heads(repo, subset, x): | |
403 s = getset(repo, subset, x) | |
404 ps = set(parents(repo, subset, x)) | |
405 return [r for r in s if r not in ps] | |
406 | |
407 def roots(repo, subset, x): | |
408 s = getset(repo, subset, x) | |
409 cs = set(children(repo, subset, x)) | |
410 return [r for r in s if r not in cs] | |
411 | |
412 def outgoing(repo, subset, x): | |
11293
0e5ce2325795
revset: delay import of hg to avoid start-up import loops
Matt Mackall <mpm@selenic.com>
parents:
11289
diff
changeset
|
413 import hg # avoid start-up nasties |
11275 | 414 l = getlist(x) |
415 if len(l) == 1: | |
416 dest = getstring(l[0], "outgoing wants a repo path") | |
417 else: | |
418 dest = '' | |
419 dest = repo.ui.expandpath(dest or 'default-push', dest or 'default') | |
420 dest, branches = hg.parseurl(dest) | |
421 other = hg.repository(hg.remoteui(repo, {}), dest) | |
422 repo.ui.pushbuffer() | |
11301
3d0591a66118
move discovery methods from localrepo into new discovery module
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
11293
diff
changeset
|
423 o = discovery.findoutgoing(repo, other) |
11275 | 424 repo.ui.popbuffer() |
425 cl = repo.changelog | |
426 o = set([cl.rev(r) for r in repo.changelog.nodesbetween(o, None)[0]]) | |
427 print 'out', dest, o | |
428 return [r for r in subset if r in o] | |
429 | |
11280
a5eb0bf7e158
revset: add tagged predicate
Matt Mackall <mpm@selenic.com>
parents:
11279
diff
changeset
|
430 def tagged(repo, subset, x): |
a5eb0bf7e158
revset: add tagged predicate
Matt Mackall <mpm@selenic.com>
parents:
11279
diff
changeset
|
431 cl = repo.changelog |
a5eb0bf7e158
revset: add tagged predicate
Matt Mackall <mpm@selenic.com>
parents:
11279
diff
changeset
|
432 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
|
433 return [r for r in subset if r in s] |
a5eb0bf7e158
revset: add tagged predicate
Matt Mackall <mpm@selenic.com>
parents:
11279
diff
changeset
|
434 |
11275 | 435 symbols = { |
11284
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
436 "adds": adds, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
437 "all": getall, |
11275 | 438 "ancestor": ancestor, |
439 "ancestors": ancestors, | |
11284
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
440 "author": author, |
11275 | 441 "branch": branch, |
11284
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
442 "children": children, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
443 "closed": closed, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
444 "contains": contains, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
445 "date": date, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
446 "descendants": descendants, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
447 "file": hasfile, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
448 "follow": follow, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
449 "grep": grep, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
450 "head": head, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
451 "heads": heads, |
11275 | 452 "keyword": keyword, |
11284
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
453 "limit": limit, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
454 "max": maxrev, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
455 "merge": merge, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
456 "modifies": modifies, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
457 "outgoing": outgoing, |
11275 | 458 "p1": p1, |
459 "p2": p2, | |
460 "parents": parents, | |
11284
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
461 "removes": removes, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
462 "reverse": reverse, |
11275 | 463 "roots": roots, |
11284
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
464 "sort": sort, |
11280
a5eb0bf7e158
revset: add tagged predicate
Matt Mackall <mpm@selenic.com>
parents:
11279
diff
changeset
|
465 "tagged": tagged, |
11284
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
466 "user": author, |
11275 | 467 } |
468 | |
469 methods = { | |
470 "negate": negate, | |
471 "range": rangeset, | |
472 "string": stringset, | |
473 "symbol": symbolset, | |
474 "and": andset, | |
475 "or": orset, | |
476 "not": notset, | |
477 "list": listset, | |
478 "func": func, | |
479 } | |
480 | |
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
481 def optimize(x, small): |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
482 if x == None: |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
483 return 0, x |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
484 |
11275 | 485 smallbonus = 1 |
486 if small: | |
487 smallbonus = .5 | |
488 | |
489 op = x[0] | |
11283
a6356b2695a3
revset: fix - handling in the optimizer
Matt Mackall <mpm@selenic.com>
parents:
11282
diff
changeset
|
490 if op == 'minus': |
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
491 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
|
492 elif op == 'dagrange': |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
493 return optimize(('and', ('func', ('symbol', 'descendants'), x[1]), |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
494 ('func', ('symbol', 'ancestors'), x[2])), small) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
495 elif op == 'dagrangepre': |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
496 return optimize(('func', ('symbol', 'ancestors'), x[1]), small) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
497 elif op == 'dagrangepost': |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
498 return optimize(('func', ('symbol', 'descendants'), x[1]), small) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
499 elif op == 'rangepre': |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
500 return optimize(('range', ('string', '0'), x[1]), small) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
501 elif op == 'rangepost': |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
502 return optimize(('range', x[1], ('string', 'tip')), small) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
503 elif op in 'string symbol negate': |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
504 return smallbonus, x # single revisions are small |
11275 | 505 elif op == 'and' or op == 'dagrange': |
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
506 wa, ta = optimize(x[1], True) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
507 wb, tb = optimize(x[2], True) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
508 w = min(wa, wb) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
509 if wa > wb: |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
510 return w, (op, tb, ta) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
511 return w, (op, ta, tb) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
512 elif op == 'or': |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
513 wa, ta = optimize(x[1], False) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
514 wb, tb = optimize(x[2], False) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
515 if wb < wa: |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
516 wb, wa = wa, wb |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
517 return max(wa, wb), (op, ta, tb) |
11275 | 518 elif op == 'not': |
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
519 o = optimize(x[1], not small) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
520 return o[0], (op, o[1]) |
11275 | 521 elif op == 'group': |
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
522 return optimize(x[1], small) |
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 |