Mercurial > hg
annotate mercurial/revset.py @ 11454:9b0406b23be0 stable
merge: pass constant cset ancestor to fctx.ancestor
author | Peter Arrenbrecht <peter.arrenbrecht@gmail.com> |
---|---|
date | Fri, 18 Jun 2010 08:49:24 +0200 |
parents | 0f623839a5cc |
children | 88abbb046e66 |
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 |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
11 from i18n import _ |
11275 | 12 |
13 elements = { | |
14 "(": (20, ("group", 1, ")"), ("func", 1, ")")), | |
15 "-": (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
|
16 "::": (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
|
17 ("dagrangepost", 17)), |
7df88cdf47fd
revset: add support for prefix and suffix versions of : and ::
Matt Mackall <mpm@selenic.com>
parents:
11275
diff
changeset
|
18 "..": (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
|
19 ("dagrangepost", 17)), |
7df88cdf47fd
revset: add support for prefix and suffix versions of : and ::
Matt Mackall <mpm@selenic.com>
parents:
11275
diff
changeset
|
20 ":": (15, ("rangepre", 15), ("range", 15), ("rangepost", 15)), |
11275 | 21 "not": (10, ("not", 10)), |
22 "!": (10, ("not", 10)), | |
23 "and": (5, None, ("and", 5)), | |
24 "&": (5, None, ("and", 5)), | |
25 "or": (4, None, ("or", 4)), | |
26 "|": (4, None, ("or", 4)), | |
27 "+": (4, None, ("or", 4)), | |
28 ",": (2, None, ("list", 2)), | |
29 ")": (0, None, None), | |
30 "symbol": (0, ("symbol",), None), | |
31 "string": (0, ("string",), None), | |
32 "end": (0, None, None), | |
33 } | |
34 | |
35 keywords = set(['and', 'or', 'not']) | |
36 | |
37 def tokenize(program): | |
38 pos, l = 0, len(program) | |
39 while pos < l: | |
40 c = program[pos] | |
41 if c.isspace(): # skip inter-token whitespace | |
42 pass | |
11278
7df88cdf47fd
revset: add support for prefix and suffix versions of : and ::
Matt Mackall <mpm@selenic.com>
parents:
11275
diff
changeset
|
43 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
|
44 yield ('::', None, pos) |
11278
7df88cdf47fd
revset: add support for prefix and suffix versions of : and ::
Matt Mackall <mpm@selenic.com>
parents:
11275
diff
changeset
|
45 pos += 1 # skip ahead |
11275 | 46 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
|
47 yield ('..', None, pos) |
11275 | 48 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
|
49 elif c in "():,-|&+!": # handle simple operators |
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
50 yield (c, None, pos) |
11275 | 51 elif c in '"\'': # handle quoted strings |
52 pos += 1 | |
53 s = pos | |
54 while pos < l: # find closing quote | |
55 d = program[pos] | |
56 if d == '\\': # skip over escaped characters | |
57 pos += 2 | |
58 continue | |
59 if d == c: | |
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
60 yield ('string', program[s:pos].decode('string-escape'), s) |
11275 | 61 break |
62 pos += 1 | |
63 else: | |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
64 raise error.ParseError(_("unterminated string"), s) |
11404
37cbedbeae96
revset: allow extended characters in symbols
Matt Mackall <mpm@selenic.com>
parents:
11385
diff
changeset
|
65 elif c.isalnum() or c in '._' or ord(c) > 127: # gather up a symbol/keyword |
11275 | 66 s = pos |
67 pos += 1 | |
68 while pos < l: # find end of symbol | |
69 d = program[pos] | |
11404
37cbedbeae96
revset: allow extended characters in symbols
Matt Mackall <mpm@selenic.com>
parents:
11385
diff
changeset
|
70 if not (d.isalnum() or d in "._" or ord(d) > 127): |
11275 | 71 break |
72 if d == '.' and program[pos - 1] == '.': # special case for .. | |
73 pos -= 1 | |
74 break | |
75 pos += 1 | |
76 sym = program[s:pos] | |
77 if sym in keywords: # operator keywords | |
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
78 yield (sym, None, s) |
11275 | 79 else: |
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
80 yield ('symbol', sym, s) |
11275 | 81 pos -= 1 |
82 else: | |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
83 raise error.ParseError(_("syntax error"), pos) |
11275 | 84 pos += 1 |
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
85 yield ('end', None, pos) |
11275 | 86 |
87 # helpers | |
88 | |
89 def getstring(x, err): | |
11406
42408cd43f55
revset: fix up contains/getstring when no args passed
Matt Mackall <mpm@selenic.com>
parents:
11404
diff
changeset
|
90 if x and (x[0] == 'string' or x[0] == 'symbol'): |
11275 | 91 return x[1] |
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
92 raise error.ParseError(err) |
11275 | 93 |
94 def getlist(x): | |
95 if not x: | |
96 return [] | |
97 if x[0] == 'list': | |
98 return getlist(x[1]) + [x[2]] | |
99 return [x] | |
100 | |
11339
744d5b73f776
revset: improve filter argument handling
Matt Mackall <mpm@selenic.com>
parents:
11304
diff
changeset
|
101 def getargs(x, min, max, err): |
11275 | 102 l = getlist(x) |
11339
744d5b73f776
revset: improve filter argument handling
Matt Mackall <mpm@selenic.com>
parents:
11304
diff
changeset
|
103 if len(l) < min or len(l) > max: |
11289
4215ce511134
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com>
parents:
11284
diff
changeset
|
104 raise error.ParseError(err) |
11275 | 105 return l |
106 | |
107 def getset(repo, subset, x): | |
108 if not x: | |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
109 raise error.ParseError(_("missing argument")) |
11275 | 110 return methods[x[0]](repo, subset, *x[1:]) |
111 | |
112 # operator methods | |
113 | |
114 def negate(repo, subset, x): | |
115 return getset(repo, subset, | |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
116 ('string', '-' + getstring(x, _("can't negate that")))) |
11275 | 117 |
118 def stringset(repo, subset, x): | |
119 x = repo[x].rev() | |
11282 | 120 if x == -1 and len(subset) == len(repo): |
121 return [-1] | |
11275 | 122 if x in subset: |
123 return [x] | |
124 return [] | |
125 | |
126 def symbolset(repo, subset, x): | |
127 if x in symbols: | |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
128 raise error.ParseError(_("can't use %s here") % x) |
11275 | 129 return stringset(repo, subset, x) |
130 | |
131 def rangeset(repo, subset, x, y): | |
132 m = getset(repo, subset, x)[0] | |
133 n = getset(repo, subset, y)[-1] | |
134 if m < n: | |
135 return range(m, n + 1) | |
136 return range(m, n - 1, -1) | |
137 | |
138 def andset(repo, subset, x, y): | |
139 return getset(repo, getset(repo, subset, x), y) | |
140 | |
141 def orset(repo, subset, x, y): | |
142 s = set(getset(repo, subset, x)) | |
143 s |= set(getset(repo, [r for r in subset if r not in s], y)) | |
144 return [r for r in subset if r in s] | |
145 | |
146 def notset(repo, subset, x): | |
147 s = set(getset(repo, subset, x)) | |
148 return [r for r in subset if r not in s] | |
149 | |
150 def listset(repo, subset, a, b): | |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
151 raise error.ParseError(_("can't use a list in this context")) |
11275 | 152 |
153 def func(repo, subset, a, b): | |
154 if a[0] == 'symbol' and a[1] in symbols: | |
155 return symbols[a[1]](repo, subset, b) | |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
156 raise error.ParseError(_("not a function: %s") % a[1]) |
11275 | 157 |
158 # functions | |
159 | |
160 def p1(repo, subset, x): | |
161 ps = set() | |
162 cl = repo.changelog | |
163 for r in getset(repo, subset, x): | |
164 ps.add(cl.parentrevs(r)[0]) | |
165 return [r for r in subset if r in ps] | |
166 | |
167 def p2(repo, subset, x): | |
168 ps = set() | |
169 cl = repo.changelog | |
170 for r in getset(repo, subset, x): | |
171 ps.add(cl.parentrevs(r)[1]) | |
172 return [r for r in subset if r in ps] | |
173 | |
174 def parents(repo, subset, x): | |
175 ps = set() | |
176 cl = repo.changelog | |
177 for r in getset(repo, subset, x): | |
178 ps.update(cl.parentrevs(r)) | |
179 return [r for r in subset if r in ps] | |
180 | |
181 def maxrev(repo, subset, x): | |
182 s = getset(repo, subset, x) | |
183 if s: | |
184 m = max(s) | |
185 if m in subset: | |
186 return [m] | |
187 return [] | |
188 | |
189 def limit(repo, subset, x): | |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
190 l = getargs(x, 2, 2, _("limit wants two arguments")) |
11275 | 191 try: |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
192 lim = int(getstring(l[1], _("limit wants a number"))) |
11275 | 193 except ValueError: |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
194 raise error.ParseError(_("limit expects a number")) |
11275 | 195 return getset(repo, subset, l[0])[:lim] |
196 | |
197 def children(repo, subset, x): | |
198 cs = set() | |
199 cl = repo.changelog | |
200 s = set(getset(repo, subset, x)) | |
201 for r in xrange(0, len(repo)): | |
202 for p in cl.parentrevs(r): | |
203 if p in s: | |
204 cs.add(r) | |
205 return [r for r in subset if r in cs] | |
206 | |
207 def branch(repo, subset, x): | |
208 s = getset(repo, range(len(repo)), x) | |
209 b = set() | |
210 for r in s: | |
211 b.add(repo[r].branch()) | |
212 s = set(s) | |
213 return [r for r in subset if r in s or repo[r].branch() in b] | |
214 | |
215 def ancestor(repo, subset, x): | |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
216 l = getargs(x, 2, 2, _("ancestor wants two arguments")) |
11275 | 217 a = getset(repo, subset, l[0]) |
218 b = getset(repo, subset, l[1]) | |
219 if len(a) > 1 or len(b) > 1: | |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
220 raise error.ParseError(_("ancestor arguments must be single revisions")) |
11275 | 221 return [repo[a[0]].ancestor(repo[b[0]]).rev()] |
222 | |
223 def ancestors(repo, subset, x): | |
224 args = getset(repo, range(len(repo)), x) | |
225 s = set(repo.changelog.ancestors(*args)) | set(args) | |
226 return [r for r in subset if r in s] | |
227 | |
228 def descendants(repo, subset, x): | |
229 args = getset(repo, range(len(repo)), x) | |
230 s = set(repo.changelog.descendants(*args)) | set(args) | |
231 return [r for r in subset if r in s] | |
232 | |
233 def follow(repo, subset, x): | |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
234 getargs(x, 0, 0, _("follow takes no arguments")) |
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): | |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
240 ds = getstring(x, _("date wants a string")) |
11275 | 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): | |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
245 kw = getstring(x, _("keyword wants a string")).lower() |
11275 | 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): | |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
255 gr = re.compile(getstring(x, _("grep wants a string"))) |
11275 | 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): | |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
266 n = getstring(x, _("author wants a string")).lower() |
11275 | 267 return [r for r in subset if n in repo[r].user().lower()] |
268 | |
269 def hasfile(repo, subset, x): | |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
270 pat = getstring(x, _("file wants a pattern")) |
11275 | 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): | |
11406
42408cd43f55
revset: fix up contains/getstring when no args passed
Matt Mackall <mpm@selenic.com>
parents:
11404
diff
changeset
|
281 pat = getstring(x, _("contains wants a pattern")) |
11275 | 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 for f in repo[r].manifest(): | |
292 if m(f): | |
293 s.append(r) | |
294 continue | |
295 return s | |
296 | |
297 def checkstatus(repo, subset, pat, field): | |
298 m = _match.match(repo.root, repo.getcwd(), [pat]) | |
299 s = [] | |
300 fast = (m.files() == [pat]) | |
301 for r in subset: | |
302 c = repo[r] | |
303 if fast: | |
304 if pat not in c.files(): | |
305 continue | |
306 else: | |
307 for f in c.files(): | |
308 if m(f): | |
309 break | |
310 else: | |
311 continue | |
312 files = repo.status(c.p1().node(), c.node())[field] | |
313 if fast: | |
314 if pat in files: | |
315 s.append(r) | |
316 continue | |
317 else: | |
318 for f in files: | |
319 if m(f): | |
320 s.append(r) | |
321 continue | |
322 return s | |
323 | |
324 def modifies(repo, subset, x): | |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
325 pat = getstring(x, _("modifies wants a pattern")) |
11275 | 326 return checkstatus(repo, subset, pat, 0) |
327 | |
328 def adds(repo, subset, x): | |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
329 pat = getstring(x, _("adds wants a pattern")) |
11275 | 330 return checkstatus(repo, subset, pat, 1) |
331 | |
332 def removes(repo, subset, x): | |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
333 pat = getstring(x, _("removes wants a pattern")) |
11275 | 334 return checkstatus(repo, subset, pat, 2) |
335 | |
336 def merge(repo, subset, x): | |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
337 getargs(x, 0, 0, _("merge takes no arguments")) |
11275 | 338 cl = repo.changelog |
339 return [r for r in subset if cl.parentrevs(r)[1] != -1] | |
340 | |
341 def closed(repo, subset, x): | |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
342 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
|
343 return [r for r in subset if repo[r].extra().get('close')] |
11275 | 344 |
345 def head(repo, subset, x): | |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
346 getargs(x, 0, 0, _("head takes no arguments")) |
11275 | 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): | |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
358 l = getargs(x, 1, 2, _("sort wants one or two arguments")) |
11275 | 359 keys = "rev" |
360 if len(l) == 2: | |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
361 keys = getstring(l[1], _("sort spec must be a string")) |
11275 | 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: | |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
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): | |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
400 getargs(x, 0, 0, _("all takes no arguments")) |
11275 | 401 return subset |
402 | |
403 def heads(repo, subset, x): | |
404 s = getset(repo, subset, x) | |
405 ps = set(parents(repo, subset, x)) | |
406 return [r for r in s if r not in ps] | |
407 | |
408 def roots(repo, subset, x): | |
409 s = getset(repo, subset, x) | |
410 cs = set(children(repo, subset, x)) | |
411 return [r for r in s if r not in cs] | |
412 | |
413 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
|
414 import hg # avoid start-up nasties |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
415 l = getargs(x, 0, 1, _("outgoing wants a repository path")) |
11339
744d5b73f776
revset: improve filter argument handling
Matt Mackall <mpm@selenic.com>
parents:
11304
diff
changeset
|
416 dest = l[1:] or '' |
11275 | 417 dest = repo.ui.expandpath(dest or 'default-push', dest or 'default') |
418 dest, branches = hg.parseurl(dest) | |
419 other = hg.repository(hg.remoteui(repo, {}), dest) | |
420 repo.ui.pushbuffer() | |
11301
3d0591a66118
move discovery methods from localrepo into new discovery module
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
11293
diff
changeset
|
421 o = discovery.findoutgoing(repo, other) |
11275 | 422 repo.ui.popbuffer() |
423 cl = repo.changelog | |
424 o = set([cl.rev(r) for r in repo.changelog.nodesbetween(o, None)[0]]) | |
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): |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
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': |
11383
de544774ebea
revset: all your error messages are belong to _
Martin Geisler <mg@lazybytes.net>
parents:
11349
diff
changeset
|
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): | |
11385
e5a2134c083b
revset: nicer exception for empty queries
Matt Mackall <mpm@selenic.com>
parents:
11383
diff
changeset
|
548 if not spec: |
e5a2134c083b
revset: nicer exception for empty queries
Matt Mackall <mpm@selenic.com>
parents:
11383
diff
changeset
|
549 raise error.ParseError(_("empty query")) |
11275 | 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 |