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