author | Martin Geisler <mg@lazybytes.net> |
Fri, 18 Jun 2010 20:06:32 +0200 | |
changeset 11381 | a4d84792338b |
parent 11349 | cf8a9154a362 |
child 11383 | de544774ebea |
permissions | -rw-r--r-- |
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 |
||
11339
744d5b73f776
revset: improve filter argument handling
Matt Mackall <mpm@selenic.com>
parents:
11304
diff
changeset
|
100 |
def getargs(x, min, max, err): |
11275 | 101 |
l = getlist(x) |
11339
744d5b73f776
revset: improve filter argument handling
Matt Mackall <mpm@selenic.com>
parents:
11304
diff
changeset
|
102 |
if len(l) < min or len(l) > max: |
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): |
|
11339
744d5b73f776
revset: improve filter argument handling
Matt Mackall <mpm@selenic.com>
parents:
11304
diff
changeset
|
189 |
l = getargs(x, 2, 2, "limit wants two args") |
11275 | 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): |
|
11339
744d5b73f776
revset: improve filter argument handling
Matt Mackall <mpm@selenic.com>
parents:
11304
diff
changeset
|
215 |
l = getargs(x, 2, 2, "ancestor wants two args") |
11275 | 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): |
|
11339
744d5b73f776
revset: improve filter argument handling
Matt Mackall <mpm@selenic.com>
parents:
11304
diff
changeset
|
233 |
getargs(x, 0, 0, "follow takes no arguments") |
11275 | 234 |
p = repo['.'].rev() |
235 |
s = set(repo.changelog.ancestors(p)) | set([p]) |
|
236 |
return [r for r in subset if r in s] |
|
237 |
||
238 |
def date(repo, subset, x): |
|
239 |
ds = getstring(x, 'date wants a string') |
|
240 |
dm = util.matchdate(ds) |
|
241 |
return [r for r in subset if dm(repo[r].date()[0])] |
|
242 |
||
243 |
def keyword(repo, subset, x): |
|
244 |
kw = getstring(x, "keyword wants a string").lower() |
|
245 |
l = [] |
|
246 |
for r in subset: |
|
247 |
c = repo[r] |
|
248 |
t = " ".join(c.files() + [c.user(), c.description()]) |
|
249 |
if kw in t.lower(): |
|
250 |
l.append(r) |
|
251 |
return l |
|
252 |
||
253 |
def grep(repo, subset, x): |
|
254 |
gr = re.compile(getstring(x, "grep wants a string")) |
|
255 |
l = [] |
|
256 |
for r in subset: |
|
257 |
c = repo[r] |
|
258 |
for e in c.files() + [c.user(), c.description()]: |
|
259 |
if gr.search(e): |
|
260 |
l.append(r) |
|
261 |
continue |
|
262 |
return l |
|
263 |
||
264 |
def author(repo, subset, x): |
|
265 |
n = getstring(x, "author wants a string").lower() |
|
266 |
return [r for r in subset if n in repo[r].user().lower()] |
|
267 |
||
268 |
def hasfile(repo, subset, x): |
|
269 |
pat = getstring(x, "file wants a pattern") |
|
270 |
m = _match.match(repo.root, repo.getcwd(), [pat]) |
|
271 |
s = [] |
|
272 |
for r in subset: |
|
273 |
for f in repo[r].files(): |
|
274 |
if m(f): |
|
275 |
s.append(r) |
|
276 |
continue |
|
277 |
return s |
|
278 |
||
279 |
def contains(repo, subset, x): |
|
280 |
pat = getstring(x, "file wants a pattern") |
|
281 |
m = _match.match(repo.root, repo.getcwd(), [pat]) |
|
282 |
s = [] |
|
283 |
if m.files() == [pat]: |
|
284 |
for r in subset: |
|
285 |
if pat in repo[r]: |
|
286 |
s.append(r) |
|
287 |
continue |
|
288 |
else: |
|
289 |
for r in subset: |
|
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): |
|
11339
744d5b73f776
revset: improve filter argument handling
Matt Mackall <mpm@selenic.com>
parents:
11304
diff
changeset
|
336 |
getargs(x, 0, 0, "merge takes no arguments") |
11275 | 337 |
cl = repo.changelog |
338 |
return [r for r in subset if cl.parentrevs(r)[1] != -1] |
|
339 |
||
340 |
def closed(repo, subset, x): |
|
11339
744d5b73f776
revset: improve filter argument handling
Matt Mackall <mpm@selenic.com>
parents:
11304
diff
changeset
|
341 |
getargs(x, 0, 0, "closed takes no arguments") |
11349
cf8a9154a362
revset: fix call to ctx.extra() in closed()
Georg Brandl <georg@python.org>
parents:
11339
diff
changeset
|
342 |
return [r for r in subset if repo[r].extra().get('close')] |
11275 | 343 |
|
344 |
def head(repo, subset, x): |
|
11339
744d5b73f776
revset: improve filter argument handling
Matt Mackall <mpm@selenic.com>
parents:
11304
diff
changeset
|
345 |
getargs(x, 0, 0, "head takes no arguments") |
11275 | 346 |
hs = set() |
347 |
for b, ls in repo.branchmap().iteritems(): |
|
348 |
hs.update(repo[h].rev() for h in ls) |
|
349 |
return [r for r in subset if r in hs] |
|
350 |
||
351 |
def reverse(repo, subset, x): |
|
352 |
l = getset(repo, subset, x) |
|
353 |
l.reverse() |
|
354 |
return l |
|
355 |
||
356 |
def sort(repo, subset, x): |
|
11339
744d5b73f776
revset: improve filter argument handling
Matt Mackall <mpm@selenic.com>
parents:
11304
diff
changeset
|
357 |
l = getargs(x, 1, 2, "sort wants one or two arguments") |
11275 | 358 |
keys = "rev" |
359 |
if len(l) == 2: |
|
360 |
keys = getstring(l[1], "sort spec must be a string") |
|
361 |
||
362 |
s = l[0] |
|
363 |
keys = keys.split() |
|
364 |
l = [] |
|
365 |
def invert(s): |
|
366 |
return "".join(chr(255 - ord(c)) for c in s) |
|
367 |
for r in getset(repo, subset, s): |
|
368 |
c = repo[r] |
|
369 |
e = [] |
|
370 |
for k in keys: |
|
371 |
if k == 'rev': |
|
372 |
e.append(r) |
|
373 |
elif k == '-rev': |
|
374 |
e.append(-r) |
|
375 |
elif k == 'branch': |
|
376 |
e.append(c.branch()) |
|
377 |
elif k == '-branch': |
|
378 |
e.append(invert(c.branch())) |
|
379 |
elif k == 'desc': |
|
380 |
e.append(c.description()) |
|
381 |
elif k == '-desc': |
|
382 |
e.append(invert(c.description())) |
|
383 |
elif k in 'user author': |
|
384 |
e.append(c.user()) |
|
385 |
elif k in '-user -author': |
|
386 |
e.append(invert(c.user())) |
|
387 |
elif k == 'date': |
|
388 |
e.append(c.date()[0]) |
|
389 |
elif k == '-date': |
|
390 |
e.append(-c.date()[0]) |
|
391 |
else: |
|
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
392 |
raise error.ParseError("unknown sort key %r" % k) |
11275 | 393 |
e.append(r) |
394 |
l.append(e) |
|
395 |
l.sort() |
|
396 |
return [e[-1] for e in l] |
|
397 |
||
398 |
def getall(repo, subset, x): |
|
11339
744d5b73f776
revset: improve filter argument handling
Matt Mackall <mpm@selenic.com>
parents:
11304
diff
changeset
|
399 |
getargs(x, 0, 0, "all takes no arguments") |
11275 | 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 |
11339
744d5b73f776
revset: improve filter argument handling
Matt Mackall <mpm@selenic.com>
parents:
11304
diff
changeset
|
414 |
l = getargs(x, 0, 1, "outgoing wants a repo path") |
744d5b73f776
revset: improve filter argument handling
Matt Mackall <mpm@selenic.com>
parents:
11304
diff
changeset
|
415 |
dest = l[1:] or '' |
11275 | 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() |
|
11301
3d0591a66118
move discovery methods from localrepo into new discovery module
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
11293
diff
changeset
|
420 |
o = discovery.findoutgoing(repo, other) |
11275 | 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): |
11339
744d5b73f776
revset: improve filter argument handling
Matt Mackall <mpm@selenic.com>
parents:
11304
diff
changeset
|
428 |
getargs(x, 0, 0, "tagged takes no arguments") |
11280
a5eb0bf7e158
revset: add tagged predicate
Matt Mackall <mpm@selenic.com>
parents:
11279
diff
changeset
|
429 |
cl = repo.changelog |
a5eb0bf7e158
revset: add tagged predicate
Matt Mackall <mpm@selenic.com>
parents:
11279
diff
changeset
|
430 |
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
|
431 |
return [r for r in subset if r in s] |
a5eb0bf7e158
revset: add tagged predicate
Matt Mackall <mpm@selenic.com>
parents:
11279
diff
changeset
|
432 |
|
11275 | 433 |
symbols = { |
11284
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
434 |
"adds": adds, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
435 |
"all": getall, |
11275 | 436 |
"ancestor": ancestor, |
437 |
"ancestors": ancestors, |
|
11284
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
438 |
"author": author, |
11275 | 439 |
"branch": branch, |
11284
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
440 |
"children": children, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
441 |
"closed": closed, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
442 |
"contains": contains, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
443 |
"date": date, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
444 |
"descendants": descendants, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
445 |
"file": hasfile, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
446 |
"follow": follow, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
447 |
"grep": grep, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
448 |
"head": head, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
449 |
"heads": heads, |
11275 | 450 |
"keyword": keyword, |
11284
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
451 |
"limit": limit, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
452 |
"max": maxrev, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
453 |
"merge": merge, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
454 |
"modifies": modifies, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
455 |
"outgoing": outgoing, |
11275 | 456 |
"p1": p1, |
457 |
"p2": p2, |
|
458 |
"parents": parents, |
|
11284
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
459 |
"removes": removes, |
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
460 |
"reverse": reverse, |
11275 | 461 |
"roots": roots, |
11284
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
462 |
"sort": sort, |
11280
a5eb0bf7e158
revset: add tagged predicate
Matt Mackall <mpm@selenic.com>
parents:
11279
diff
changeset
|
463 |
"tagged": tagged, |
11284
0b5c2e82aeb5
revset: sort the predicate list
Matt Mackall <mpm@selenic.com>
parents:
11283
diff
changeset
|
464 |
"user": author, |
11275 | 465 |
} |
466 |
||
467 |
methods = { |
|
468 |
"negate": negate, |
|
469 |
"range": rangeset, |
|
470 |
"string": stringset, |
|
471 |
"symbol": symbolset, |
|
472 |
"and": andset, |
|
473 |
"or": orset, |
|
474 |
"not": notset, |
|
475 |
"list": listset, |
|
476 |
"func": func, |
|
477 |
} |
|
478 |
||
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
479 |
def optimize(x, small): |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
480 |
if x == None: |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
481 |
return 0, x |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
482 |
|
11275 | 483 |
smallbonus = 1 |
484 |
if small: |
|
485 |
smallbonus = .5 |
|
486 |
||
487 |
op = x[0] |
|
11283
a6356b2695a3
revset: fix - handling in the optimizer
Matt Mackall <mpm@selenic.com>
parents:
11282
diff
changeset
|
488 |
if op == 'minus': |
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
489 |
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
|
490 |
elif op == 'dagrange': |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
491 |
return optimize(('and', ('func', ('symbol', 'descendants'), x[1]), |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
492 |
('func', ('symbol', 'ancestors'), x[2])), small) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
493 |
elif op == 'dagrangepre': |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
494 |
return optimize(('func', ('symbol', 'ancestors'), x[1]), small) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
495 |
elif op == 'dagrangepost': |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
496 |
return optimize(('func', ('symbol', 'descendants'), x[1]), small) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
497 |
elif op == 'rangepre': |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
498 |
return optimize(('range', ('string', '0'), x[1]), small) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
499 |
elif op == 'rangepost': |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
500 |
return optimize(('range', x[1], ('string', 'tip')), small) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
501 |
elif op in 'string symbol negate': |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
502 |
return smallbonus, x # single revisions are small |
11275 | 503 |
elif op == 'and' or op == 'dagrange': |
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
504 |
wa, ta = optimize(x[1], True) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
505 |
wb, tb = optimize(x[2], True) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
506 |
w = min(wa, wb) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
507 |
if wa > wb: |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
508 |
return w, (op, tb, ta) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
509 |
return w, (op, ta, tb) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
510 |
elif op == 'or': |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
511 |
wa, ta = optimize(x[1], False) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
512 |
wb, tb = optimize(x[2], False) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
513 |
if wb < wa: |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
514 |
wb, wa = wa, wb |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
515 |
return max(wa, wb), (op, ta, tb) |
11275 | 516 |
elif op == 'not': |
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
517 |
o = optimize(x[1], not small) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
518 |
return o[0], (op, o[1]) |
11275 | 519 |
elif op == 'group': |
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
520 |
return optimize(x[1], small) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
521 |
elif op in 'range list': |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
522 |
wa, ta = optimize(x[1], small) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
523 |
wb, tb = optimize(x[2], small) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
524 |
return wa + wb, (op, ta, tb) |
11275 | 525 |
elif op == 'func': |
526 |
f = getstring(x[1], "not a symbol") |
|
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
527 |
wa, ta = optimize(x[2], small) |
11275 | 528 |
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
|
529 |
w = 10 # slow |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
530 |
elif f in "modifies adds removes outgoing": |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
531 |
w = 30 # slower |
11275 | 532 |
elif f == "contains": |
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
533 |
w = 100 # very slow |
11275 | 534 |
elif f == "ancestor": |
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
535 |
w = 1 * smallbonus |
11275 | 536 |
elif f == "reverse limit": |
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
537 |
w = 0 |
11275 | 538 |
elif f in "sort": |
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
539 |
w = 10 # assume most sorts look at changelog |
11275 | 540 |
else: |
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
541 |
w = 1 |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
542 |
return w + wa, (op, x[1], ta) |
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
543 |
return 1, x |
11275 | 544 |
|
545 |
parse = parser.parser(tokenize, elements).parse |
|
546 |
||
547 |
def match(spec): |
|
548 |
tree = parse(spec) |
|
11279
62ccf4cd6e7f
revset: optimize the parse tree directly
Matt Mackall <mpm@selenic.com>
parents:
11278
diff
changeset
|
549 |
weight, tree = optimize(tree, True) |
11275 | 550 |
def mfunc(repo, subset): |
551 |
return getset(repo, subset, tree) |
|
552 |
return mfunc |