##// END OF EJS Templates
revset: remove invalid value in the origin set...
Pierre-Yves David -
r22498:64673dc4 default
parent child Browse files
Show More
@@ -1,2851 +1,2852
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, hbisect, phases
9 import parser, util, error, discovery, hbisect, phases
10 import node
10 import node
11 import heapq
11 import heapq
12 import match as matchmod
12 import match as matchmod
13 import ancestor as ancestormod
13 import ancestor as ancestormod
14 from i18n import _
14 from i18n import _
15 import encoding
15 import encoding
16 import obsolete as obsmod
16 import obsolete as obsmod
17 import pathutil
17 import pathutil
18 import repoview
18 import repoview
19
19
20 def _revancestors(repo, revs, followfirst):
20 def _revancestors(repo, revs, followfirst):
21 """Like revlog.ancestors(), but supports followfirst."""
21 """Like revlog.ancestors(), but supports followfirst."""
22 cut = followfirst and 1 or None
22 cut = followfirst and 1 or None
23 cl = repo.changelog
23 cl = repo.changelog
24
24
25 def iterate():
25 def iterate():
26 revqueue, revsnode = None, None
26 revqueue, revsnode = None, None
27 h = []
27 h = []
28
28
29 revs.descending()
29 revs.descending()
30 revqueue = util.deque(revs)
30 revqueue = util.deque(revs)
31 if revqueue:
31 if revqueue:
32 revsnode = revqueue.popleft()
32 revsnode = revqueue.popleft()
33 heapq.heappush(h, -revsnode)
33 heapq.heappush(h, -revsnode)
34
34
35 seen = set([node.nullrev])
35 seen = set([node.nullrev])
36 while h:
36 while h:
37 current = -heapq.heappop(h)
37 current = -heapq.heappop(h)
38 if current not in seen:
38 if current not in seen:
39 if revsnode and current == revsnode:
39 if revsnode and current == revsnode:
40 if revqueue:
40 if revqueue:
41 revsnode = revqueue.popleft()
41 revsnode = revqueue.popleft()
42 heapq.heappush(h, -revsnode)
42 heapq.heappush(h, -revsnode)
43 seen.add(current)
43 seen.add(current)
44 yield current
44 yield current
45 for parent in cl.parentrevs(current)[:cut]:
45 for parent in cl.parentrevs(current)[:cut]:
46 if parent != node.nullrev:
46 if parent != node.nullrev:
47 heapq.heappush(h, -parent)
47 heapq.heappush(h, -parent)
48
48
49 return _descgeneratorset(iterate())
49 return _descgeneratorset(iterate())
50
50
51 def _revdescendants(repo, revs, followfirst):
51 def _revdescendants(repo, revs, followfirst):
52 """Like revlog.descendants() but supports followfirst."""
52 """Like revlog.descendants() but supports followfirst."""
53 cut = followfirst and 1 or None
53 cut = followfirst and 1 or None
54
54
55 def iterate():
55 def iterate():
56 cl = repo.changelog
56 cl = repo.changelog
57 first = min(revs)
57 first = min(revs)
58 nullrev = node.nullrev
58 nullrev = node.nullrev
59 if first == nullrev:
59 if first == nullrev:
60 # Are there nodes with a null first parent and a non-null
60 # Are there nodes with a null first parent and a non-null
61 # second one? Maybe. Do we care? Probably not.
61 # second one? Maybe. Do we care? Probably not.
62 for i in cl:
62 for i in cl:
63 yield i
63 yield i
64 else:
64 else:
65 seen = set(revs)
65 seen = set(revs)
66 for i in cl.revs(first + 1):
66 for i in cl.revs(first + 1):
67 for x in cl.parentrevs(i)[:cut]:
67 for x in cl.parentrevs(i)[:cut]:
68 if x != nullrev and x in seen:
68 if x != nullrev and x in seen:
69 seen.add(i)
69 seen.add(i)
70 yield i
70 yield i
71 break
71 break
72
72
73 return _ascgeneratorset(iterate())
73 return _ascgeneratorset(iterate())
74
74
75 def _revsbetween(repo, roots, heads):
75 def _revsbetween(repo, roots, heads):
76 """Return all paths between roots and heads, inclusive of both endpoint
76 """Return all paths between roots and heads, inclusive of both endpoint
77 sets."""
77 sets."""
78 if not roots:
78 if not roots:
79 return baseset([])
79 return baseset([])
80 parentrevs = repo.changelog.parentrevs
80 parentrevs = repo.changelog.parentrevs
81 visit = list(heads)
81 visit = list(heads)
82 reachable = set()
82 reachable = set()
83 seen = {}
83 seen = {}
84 minroot = min(roots)
84 minroot = min(roots)
85 roots = set(roots)
85 roots = set(roots)
86 # open-code the post-order traversal due to the tiny size of
86 # open-code the post-order traversal due to the tiny size of
87 # sys.getrecursionlimit()
87 # sys.getrecursionlimit()
88 while visit:
88 while visit:
89 rev = visit.pop()
89 rev = visit.pop()
90 if rev in roots:
90 if rev in roots:
91 reachable.add(rev)
91 reachable.add(rev)
92 parents = parentrevs(rev)
92 parents = parentrevs(rev)
93 seen[rev] = parents
93 seen[rev] = parents
94 for parent in parents:
94 for parent in parents:
95 if parent >= minroot and parent not in seen:
95 if parent >= minroot and parent not in seen:
96 visit.append(parent)
96 visit.append(parent)
97 if not reachable:
97 if not reachable:
98 return baseset([])
98 return baseset([])
99 for rev in sorted(seen):
99 for rev in sorted(seen):
100 for parent in seen[rev]:
100 for parent in seen[rev]:
101 if parent in reachable:
101 if parent in reachable:
102 reachable.add(rev)
102 reachable.add(rev)
103 return baseset(sorted(reachable))
103 return baseset(sorted(reachable))
104
104
105 elements = {
105 elements = {
106 "(": (20, ("group", 1, ")"), ("func", 1, ")")),
106 "(": (20, ("group", 1, ")"), ("func", 1, ")")),
107 "~": (18, None, ("ancestor", 18)),
107 "~": (18, None, ("ancestor", 18)),
108 "^": (18, None, ("parent", 18), ("parentpost", 18)),
108 "^": (18, None, ("parent", 18), ("parentpost", 18)),
109 "-": (5, ("negate", 19), ("minus", 5)),
109 "-": (5, ("negate", 19), ("minus", 5)),
110 "::": (17, ("dagrangepre", 17), ("dagrange", 17),
110 "::": (17, ("dagrangepre", 17), ("dagrange", 17),
111 ("dagrangepost", 17)),
111 ("dagrangepost", 17)),
112 "..": (17, ("dagrangepre", 17), ("dagrange", 17),
112 "..": (17, ("dagrangepre", 17), ("dagrange", 17),
113 ("dagrangepost", 17)),
113 ("dagrangepost", 17)),
114 ":": (15, ("rangepre", 15), ("range", 15), ("rangepost", 15)),
114 ":": (15, ("rangepre", 15), ("range", 15), ("rangepost", 15)),
115 "not": (10, ("not", 10)),
115 "not": (10, ("not", 10)),
116 "!": (10, ("not", 10)),
116 "!": (10, ("not", 10)),
117 "and": (5, None, ("and", 5)),
117 "and": (5, None, ("and", 5)),
118 "&": (5, None, ("and", 5)),
118 "&": (5, None, ("and", 5)),
119 "or": (4, None, ("or", 4)),
119 "or": (4, None, ("or", 4)),
120 "|": (4, None, ("or", 4)),
120 "|": (4, None, ("or", 4)),
121 "+": (4, None, ("or", 4)),
121 "+": (4, None, ("or", 4)),
122 ",": (2, None, ("list", 2)),
122 ",": (2, None, ("list", 2)),
123 ")": (0, None, None),
123 ")": (0, None, None),
124 "symbol": (0, ("symbol",), None),
124 "symbol": (0, ("symbol",), None),
125 "string": (0, ("string",), None),
125 "string": (0, ("string",), None),
126 "end": (0, None, None),
126 "end": (0, None, None),
127 }
127 }
128
128
129 keywords = set(['and', 'or', 'not'])
129 keywords = set(['and', 'or', 'not'])
130
130
131 def tokenize(program, lookup=None):
131 def tokenize(program, lookup=None):
132 '''
132 '''
133 Parse a revset statement into a stream of tokens
133 Parse a revset statement into a stream of tokens
134
134
135 Check that @ is a valid unquoted token character (issue3686):
135 Check that @ is a valid unquoted token character (issue3686):
136 >>> list(tokenize("@::"))
136 >>> list(tokenize("@::"))
137 [('symbol', '@', 0), ('::', None, 1), ('end', None, 3)]
137 [('symbol', '@', 0), ('::', None, 1), ('end', None, 3)]
138
138
139 '''
139 '''
140
140
141 pos, l = 0, len(program)
141 pos, l = 0, len(program)
142 while pos < l:
142 while pos < l:
143 c = program[pos]
143 c = program[pos]
144 if c.isspace(): # skip inter-token whitespace
144 if c.isspace(): # skip inter-token whitespace
145 pass
145 pass
146 elif c == ':' and program[pos:pos + 2] == '::': # look ahead carefully
146 elif c == ':' and program[pos:pos + 2] == '::': # look ahead carefully
147 yield ('::', None, pos)
147 yield ('::', None, pos)
148 pos += 1 # skip ahead
148 pos += 1 # skip ahead
149 elif c == '.' and program[pos:pos + 2] == '..': # look ahead carefully
149 elif c == '.' and program[pos:pos + 2] == '..': # look ahead carefully
150 yield ('..', None, pos)
150 yield ('..', None, pos)
151 pos += 1 # skip ahead
151 pos += 1 # skip ahead
152 elif c in "():,-|&+!~^": # handle simple operators
152 elif c in "():,-|&+!~^": # handle simple operators
153 yield (c, None, pos)
153 yield (c, None, pos)
154 elif (c in '"\'' or c == 'r' and
154 elif (c in '"\'' or c == 'r' and
155 program[pos:pos + 2] in ("r'", 'r"')): # handle quoted strings
155 program[pos:pos + 2] in ("r'", 'r"')): # handle quoted strings
156 if c == 'r':
156 if c == 'r':
157 pos += 1
157 pos += 1
158 c = program[pos]
158 c = program[pos]
159 decode = lambda x: x
159 decode = lambda x: x
160 else:
160 else:
161 decode = lambda x: x.decode('string-escape')
161 decode = lambda x: x.decode('string-escape')
162 pos += 1
162 pos += 1
163 s = pos
163 s = pos
164 while pos < l: # find closing quote
164 while pos < l: # find closing quote
165 d = program[pos]
165 d = program[pos]
166 if d == '\\': # skip over escaped characters
166 if d == '\\': # skip over escaped characters
167 pos += 2
167 pos += 2
168 continue
168 continue
169 if d == c:
169 if d == c:
170 yield ('string', decode(program[s:pos]), s)
170 yield ('string', decode(program[s:pos]), s)
171 break
171 break
172 pos += 1
172 pos += 1
173 else:
173 else:
174 raise error.ParseError(_("unterminated string"), s)
174 raise error.ParseError(_("unterminated string"), s)
175 # gather up a symbol/keyword
175 # gather up a symbol/keyword
176 elif c.isalnum() or c in '._@' or ord(c) > 127:
176 elif c.isalnum() or c in '._@' or ord(c) > 127:
177 s = pos
177 s = pos
178 pos += 1
178 pos += 1
179 while pos < l: # find end of symbol
179 while pos < l: # find end of symbol
180 d = program[pos]
180 d = program[pos]
181 if not (d.isalnum() or d in "-._/@" or ord(d) > 127):
181 if not (d.isalnum() or d in "-._/@" or ord(d) > 127):
182 break
182 break
183 if d == '.' and program[pos - 1] == '.': # special case for ..
183 if d == '.' and program[pos - 1] == '.': # special case for ..
184 pos -= 1
184 pos -= 1
185 break
185 break
186 pos += 1
186 pos += 1
187 sym = program[s:pos]
187 sym = program[s:pos]
188 if sym in keywords: # operator keywords
188 if sym in keywords: # operator keywords
189 yield (sym, None, s)
189 yield (sym, None, s)
190 elif '-' in sym:
190 elif '-' in sym:
191 # some jerk gave us foo-bar-baz, try to check if it's a symbol
191 # some jerk gave us foo-bar-baz, try to check if it's a symbol
192 if lookup and lookup(sym):
192 if lookup and lookup(sym):
193 # looks like a real symbol
193 # looks like a real symbol
194 yield ('symbol', sym, s)
194 yield ('symbol', sym, s)
195 else:
195 else:
196 # looks like an expression
196 # looks like an expression
197 parts = sym.split('-')
197 parts = sym.split('-')
198 for p in parts[:-1]:
198 for p in parts[:-1]:
199 if p: # possible consecutive -
199 if p: # possible consecutive -
200 yield ('symbol', p, s)
200 yield ('symbol', p, s)
201 s += len(p)
201 s += len(p)
202 yield ('-', None, pos)
202 yield ('-', None, pos)
203 s += 1
203 s += 1
204 if parts[-1]: # possible trailing -
204 if parts[-1]: # possible trailing -
205 yield ('symbol', parts[-1], s)
205 yield ('symbol', parts[-1], s)
206 else:
206 else:
207 yield ('symbol', sym, s)
207 yield ('symbol', sym, s)
208 pos -= 1
208 pos -= 1
209 else:
209 else:
210 raise error.ParseError(_("syntax error"), pos)
210 raise error.ParseError(_("syntax error"), pos)
211 pos += 1
211 pos += 1
212 yield ('end', None, pos)
212 yield ('end', None, pos)
213
213
214 # helpers
214 # helpers
215
215
216 def getstring(x, err):
216 def getstring(x, err):
217 if x and (x[0] == 'string' or x[0] == 'symbol'):
217 if x and (x[0] == 'string' or x[0] == 'symbol'):
218 return x[1]
218 return x[1]
219 raise error.ParseError(err)
219 raise error.ParseError(err)
220
220
221 def getlist(x):
221 def getlist(x):
222 if not x:
222 if not x:
223 return []
223 return []
224 if x[0] == 'list':
224 if x[0] == 'list':
225 return getlist(x[1]) + [x[2]]
225 return getlist(x[1]) + [x[2]]
226 return [x]
226 return [x]
227
227
228 def getargs(x, min, max, err):
228 def getargs(x, min, max, err):
229 l = getlist(x)
229 l = getlist(x)
230 if len(l) < min or (max >= 0 and len(l) > max):
230 if len(l) < min or (max >= 0 and len(l) > max):
231 raise error.ParseError(err)
231 raise error.ParseError(err)
232 return l
232 return l
233
233
234 def getset(repo, subset, x):
234 def getset(repo, subset, x):
235 if not x:
235 if not x:
236 raise error.ParseError(_("missing argument"))
236 raise error.ParseError(_("missing argument"))
237 s = methods[x[0]](repo, subset, *x[1:])
237 s = methods[x[0]](repo, subset, *x[1:])
238 if util.safehasattr(s, 'set'):
238 if util.safehasattr(s, 'set'):
239 return s
239 return s
240 return baseset(s)
240 return baseset(s)
241
241
242 def _getrevsource(repo, r):
242 def _getrevsource(repo, r):
243 extra = repo[r].extra()
243 extra = repo[r].extra()
244 for label in ('source', 'transplant_source', 'rebase_source'):
244 for label in ('source', 'transplant_source', 'rebase_source'):
245 if label in extra:
245 if label in extra:
246 try:
246 try:
247 return repo[extra[label]].rev()
247 return repo[extra[label]].rev()
248 except error.RepoLookupError:
248 except error.RepoLookupError:
249 pass
249 pass
250 return None
250 return None
251
251
252 # operator methods
252 # operator methods
253
253
254 def stringset(repo, subset, x):
254 def stringset(repo, subset, x):
255 x = repo[x].rev()
255 x = repo[x].rev()
256 if x == -1 and len(subset) == len(repo):
256 if x == -1 and len(subset) == len(repo):
257 return baseset([-1])
257 return baseset([-1])
258 if len(subset) == len(repo) or x in subset:
258 if len(subset) == len(repo) or x in subset:
259 return baseset([x])
259 return baseset([x])
260 return baseset([])
260 return baseset([])
261
261
262 def symbolset(repo, subset, x):
262 def symbolset(repo, subset, x):
263 if x in symbols:
263 if x in symbols:
264 raise error.ParseError(_("can't use %s here") % x)
264 raise error.ParseError(_("can't use %s here") % x)
265 return stringset(repo, subset, x)
265 return stringset(repo, subset, x)
266
266
267 def rangeset(repo, subset, x, y):
267 def rangeset(repo, subset, x, y):
268 cl = baseset(repo.changelog)
268 cl = baseset(repo.changelog)
269 m = getset(repo, cl, x)
269 m = getset(repo, cl, x)
270 n = getset(repo, cl, y)
270 n = getset(repo, cl, y)
271
271
272 if not m or not n:
272 if not m or not n:
273 return baseset([])
273 return baseset([])
274 m, n = m[0], n[-1]
274 m, n = m[0], n[-1]
275
275
276 if m < n:
276 if m < n:
277 r = spanset(repo, m, n + 1)
277 r = spanset(repo, m, n + 1)
278 else:
278 else:
279 r = spanset(repo, m, n - 1)
279 r = spanset(repo, m, n - 1)
280 return r & subset
280 return r & subset
281
281
282 def dagrange(repo, subset, x, y):
282 def dagrange(repo, subset, x, y):
283 r = spanset(repo)
283 r = spanset(repo)
284 xs = _revsbetween(repo, getset(repo, r, x), getset(repo, r, y))
284 xs = _revsbetween(repo, getset(repo, r, x), getset(repo, r, y))
285 s = subset.set()
285 s = subset.set()
286 return xs.filter(s.__contains__)
286 return xs.filter(s.__contains__)
287
287
288 def andset(repo, subset, x, y):
288 def andset(repo, subset, x, y):
289 return getset(repo, getset(repo, subset, x), y)
289 return getset(repo, getset(repo, subset, x), y)
290
290
291 def orset(repo, subset, x, y):
291 def orset(repo, subset, x, y):
292 xl = getset(repo, subset, x)
292 xl = getset(repo, subset, x)
293 yl = getset(repo, subset - xl, y)
293 yl = getset(repo, subset - xl, y)
294 return xl + yl
294 return xl + yl
295
295
296 def notset(repo, subset, x):
296 def notset(repo, subset, x):
297 return subset - getset(repo, subset, x)
297 return subset - getset(repo, subset, x)
298
298
299 def listset(repo, subset, a, b):
299 def listset(repo, subset, a, b):
300 raise error.ParseError(_("can't use a list in this context"))
300 raise error.ParseError(_("can't use a list in this context"))
301
301
302 def func(repo, subset, a, b):
302 def func(repo, subset, a, b):
303 if a[0] == 'symbol' and a[1] in symbols:
303 if a[0] == 'symbol' and a[1] in symbols:
304 return symbols[a[1]](repo, subset, b)
304 return symbols[a[1]](repo, subset, b)
305 raise error.ParseError(_("not a function: %s") % a[1])
305 raise error.ParseError(_("not a function: %s") % a[1])
306
306
307 # functions
307 # functions
308
308
309 def adds(repo, subset, x):
309 def adds(repo, subset, x):
310 """``adds(pattern)``
310 """``adds(pattern)``
311 Changesets that add a file matching pattern.
311 Changesets that add a file matching pattern.
312
312
313 The pattern without explicit kind like ``glob:`` is expected to be
313 The pattern without explicit kind like ``glob:`` is expected to be
314 relative to the current directory and match against a file or a
314 relative to the current directory and match against a file or a
315 directory.
315 directory.
316 """
316 """
317 # i18n: "adds" is a keyword
317 # i18n: "adds" is a keyword
318 pat = getstring(x, _("adds requires a pattern"))
318 pat = getstring(x, _("adds requires a pattern"))
319 return checkstatus(repo, subset, pat, 1)
319 return checkstatus(repo, subset, pat, 1)
320
320
321 def ancestor(repo, subset, x):
321 def ancestor(repo, subset, x):
322 """``ancestor(*changeset)``
322 """``ancestor(*changeset)``
323 A greatest common ancestor of the changesets.
323 A greatest common ancestor of the changesets.
324
324
325 Accepts 0 or more changesets.
325 Accepts 0 or more changesets.
326 Will return empty list when passed no args.
326 Will return empty list when passed no args.
327 Greatest common ancestor of a single changeset is that changeset.
327 Greatest common ancestor of a single changeset is that changeset.
328 """
328 """
329 # i18n: "ancestor" is a keyword
329 # i18n: "ancestor" is a keyword
330 l = getlist(x)
330 l = getlist(x)
331 rl = spanset(repo)
331 rl = spanset(repo)
332 anc = None
332 anc = None
333
333
334 # (getset(repo, rl, i) for i in l) generates a list of lists
334 # (getset(repo, rl, i) for i in l) generates a list of lists
335 for revs in (getset(repo, rl, i) for i in l):
335 for revs in (getset(repo, rl, i) for i in l):
336 for r in revs:
336 for r in revs:
337 if anc is None:
337 if anc is None:
338 anc = repo[r]
338 anc = repo[r]
339 else:
339 else:
340 anc = anc.ancestor(repo[r])
340 anc = anc.ancestor(repo[r])
341
341
342 if anc is not None and anc.rev() in subset:
342 if anc is not None and anc.rev() in subset:
343 return baseset([anc.rev()])
343 return baseset([anc.rev()])
344 return baseset([])
344 return baseset([])
345
345
346 def _ancestors(repo, subset, x, followfirst=False):
346 def _ancestors(repo, subset, x, followfirst=False):
347 args = getset(repo, spanset(repo), x)
347 args = getset(repo, spanset(repo), x)
348 if not args:
348 if not args:
349 return baseset([])
349 return baseset([])
350 s = _revancestors(repo, args, followfirst)
350 s = _revancestors(repo, args, followfirst)
351 return subset.filter(s.__contains__)
351 return subset.filter(s.__contains__)
352
352
353 def ancestors(repo, subset, x):
353 def ancestors(repo, subset, x):
354 """``ancestors(set)``
354 """``ancestors(set)``
355 Changesets that are ancestors of a changeset in set.
355 Changesets that are ancestors of a changeset in set.
356 """
356 """
357 return _ancestors(repo, subset, x)
357 return _ancestors(repo, subset, x)
358
358
359 def _firstancestors(repo, subset, x):
359 def _firstancestors(repo, subset, x):
360 # ``_firstancestors(set)``
360 # ``_firstancestors(set)``
361 # Like ``ancestors(set)`` but follows only the first parents.
361 # Like ``ancestors(set)`` but follows only the first parents.
362 return _ancestors(repo, subset, x, followfirst=True)
362 return _ancestors(repo, subset, x, followfirst=True)
363
363
364 def ancestorspec(repo, subset, x, n):
364 def ancestorspec(repo, subset, x, n):
365 """``set~n``
365 """``set~n``
366 Changesets that are the Nth ancestor (first parents only) of a changeset
366 Changesets that are the Nth ancestor (first parents only) of a changeset
367 in set.
367 in set.
368 """
368 """
369 try:
369 try:
370 n = int(n[1])
370 n = int(n[1])
371 except (TypeError, ValueError):
371 except (TypeError, ValueError):
372 raise error.ParseError(_("~ expects a number"))
372 raise error.ParseError(_("~ expects a number"))
373 ps = set()
373 ps = set()
374 cl = repo.changelog
374 cl = repo.changelog
375 for r in getset(repo, baseset(cl), x):
375 for r in getset(repo, baseset(cl), x):
376 for i in range(n):
376 for i in range(n):
377 r = cl.parentrevs(r)[0]
377 r = cl.parentrevs(r)[0]
378 ps.add(r)
378 ps.add(r)
379 return subset.filter(ps.__contains__)
379 return subset.filter(ps.__contains__)
380
380
381 def author(repo, subset, x):
381 def author(repo, subset, x):
382 """``author(string)``
382 """``author(string)``
383 Alias for ``user(string)``.
383 Alias for ``user(string)``.
384 """
384 """
385 # i18n: "author" is a keyword
385 # i18n: "author" is a keyword
386 n = encoding.lower(getstring(x, _("author requires a string")))
386 n = encoding.lower(getstring(x, _("author requires a string")))
387 kind, pattern, matcher = _substringmatcher(n)
387 kind, pattern, matcher = _substringmatcher(n)
388 return subset.filter(lambda x: matcher(encoding.lower(repo[x].user())))
388 return subset.filter(lambda x: matcher(encoding.lower(repo[x].user())))
389
389
390 def only(repo, subset, x):
390 def only(repo, subset, x):
391 """``only(set, [set])``
391 """``only(set, [set])``
392 Changesets that are ancestors of the first set that are not ancestors
392 Changesets that are ancestors of the first set that are not ancestors
393 of any other head in the repo. If a second set is specified, the result
393 of any other head in the repo. If a second set is specified, the result
394 is ancestors of the first set that are not ancestors of the second set
394 is ancestors of the first set that are not ancestors of the second set
395 (i.e. ::<set1> - ::<set2>).
395 (i.e. ::<set1> - ::<set2>).
396 """
396 """
397 cl = repo.changelog
397 cl = repo.changelog
398 # i18n: "only" is a keyword
398 # i18n: "only" is a keyword
399 args = getargs(x, 1, 2, _('only takes one or two arguments'))
399 args = getargs(x, 1, 2, _('only takes one or two arguments'))
400 include = getset(repo, spanset(repo), args[0]).set()
400 include = getset(repo, spanset(repo), args[0]).set()
401 if len(args) == 1:
401 if len(args) == 1:
402 if len(include) == 0:
402 if len(include) == 0:
403 return baseset([])
403 return baseset([])
404
404
405 descendants = set(_revdescendants(repo, include, False))
405 descendants = set(_revdescendants(repo, include, False))
406 exclude = [rev for rev in cl.headrevs()
406 exclude = [rev for rev in cl.headrevs()
407 if not rev in descendants and not rev in include]
407 if not rev in descendants and not rev in include]
408 else:
408 else:
409 exclude = getset(repo, spanset(repo), args[1])
409 exclude = getset(repo, spanset(repo), args[1])
410
410
411 results = set(ancestormod.missingancestors(include, exclude, cl.parentrevs))
411 results = set(ancestormod.missingancestors(include, exclude, cl.parentrevs))
412 return lazyset(subset, results.__contains__)
412 return lazyset(subset, results.__contains__)
413
413
414 def bisect(repo, subset, x):
414 def bisect(repo, subset, x):
415 """``bisect(string)``
415 """``bisect(string)``
416 Changesets marked in the specified bisect status:
416 Changesets marked in the specified bisect status:
417
417
418 - ``good``, ``bad``, ``skip``: csets explicitly marked as good/bad/skip
418 - ``good``, ``bad``, ``skip``: csets explicitly marked as good/bad/skip
419 - ``goods``, ``bads`` : csets topologically good/bad
419 - ``goods``, ``bads`` : csets topologically good/bad
420 - ``range`` : csets taking part in the bisection
420 - ``range`` : csets taking part in the bisection
421 - ``pruned`` : csets that are goods, bads or skipped
421 - ``pruned`` : csets that are goods, bads or skipped
422 - ``untested`` : csets whose fate is yet unknown
422 - ``untested`` : csets whose fate is yet unknown
423 - ``ignored`` : csets ignored due to DAG topology
423 - ``ignored`` : csets ignored due to DAG topology
424 - ``current`` : the cset currently being bisected
424 - ``current`` : the cset currently being bisected
425 """
425 """
426 # i18n: "bisect" is a keyword
426 # i18n: "bisect" is a keyword
427 status = getstring(x, _("bisect requires a string")).lower()
427 status = getstring(x, _("bisect requires a string")).lower()
428 state = set(hbisect.get(repo, status))
428 state = set(hbisect.get(repo, status))
429 return subset.filter(state.__contains__)
429 return subset.filter(state.__contains__)
430
430
431 # Backward-compatibility
431 # Backward-compatibility
432 # - no help entry so that we do not advertise it any more
432 # - no help entry so that we do not advertise it any more
433 def bisected(repo, subset, x):
433 def bisected(repo, subset, x):
434 return bisect(repo, subset, x)
434 return bisect(repo, subset, x)
435
435
436 def bookmark(repo, subset, x):
436 def bookmark(repo, subset, x):
437 """``bookmark([name])``
437 """``bookmark([name])``
438 The named bookmark or all bookmarks.
438 The named bookmark or all bookmarks.
439
439
440 If `name` starts with `re:`, the remainder of the name is treated as
440 If `name` starts with `re:`, the remainder of the name is treated as
441 a regular expression. To match a bookmark that actually starts with `re:`,
441 a regular expression. To match a bookmark that actually starts with `re:`,
442 use the prefix `literal:`.
442 use the prefix `literal:`.
443 """
443 """
444 # i18n: "bookmark" is a keyword
444 # i18n: "bookmark" is a keyword
445 args = getargs(x, 0, 1, _('bookmark takes one or no arguments'))
445 args = getargs(x, 0, 1, _('bookmark takes one or no arguments'))
446 if args:
446 if args:
447 bm = getstring(args[0],
447 bm = getstring(args[0],
448 # i18n: "bookmark" is a keyword
448 # i18n: "bookmark" is a keyword
449 _('the argument to bookmark must be a string'))
449 _('the argument to bookmark must be a string'))
450 kind, pattern, matcher = _stringmatcher(bm)
450 kind, pattern, matcher = _stringmatcher(bm)
451 if kind == 'literal':
451 if kind == 'literal':
452 bmrev = repo._bookmarks.get(pattern, None)
452 bmrev = repo._bookmarks.get(pattern, None)
453 if not bmrev:
453 if not bmrev:
454 raise util.Abort(_("bookmark '%s' does not exist") % bm)
454 raise util.Abort(_("bookmark '%s' does not exist") % bm)
455 bmrev = repo[bmrev].rev()
455 bmrev = repo[bmrev].rev()
456 return subset.filter(lambda r: r == bmrev)
456 return subset.filter(lambda r: r == bmrev)
457 else:
457 else:
458 matchrevs = set()
458 matchrevs = set()
459 for name, bmrev in repo._bookmarks.iteritems():
459 for name, bmrev in repo._bookmarks.iteritems():
460 if matcher(name):
460 if matcher(name):
461 matchrevs.add(bmrev)
461 matchrevs.add(bmrev)
462 if not matchrevs:
462 if not matchrevs:
463 raise util.Abort(_("no bookmarks exist that match '%s'")
463 raise util.Abort(_("no bookmarks exist that match '%s'")
464 % pattern)
464 % pattern)
465 bmrevs = set()
465 bmrevs = set()
466 for bmrev in matchrevs:
466 for bmrev in matchrevs:
467 bmrevs.add(repo[bmrev].rev())
467 bmrevs.add(repo[bmrev].rev())
468 return subset & bmrevs
468 return subset & bmrevs
469
469
470 bms = set([repo[r].rev()
470 bms = set([repo[r].rev()
471 for r in repo._bookmarks.values()])
471 for r in repo._bookmarks.values()])
472 return subset.filter(bms.__contains__)
472 return subset.filter(bms.__contains__)
473
473
474 def branch(repo, subset, x):
474 def branch(repo, subset, x):
475 """``branch(string or set)``
475 """``branch(string or set)``
476 All changesets belonging to the given branch or the branches of the given
476 All changesets belonging to the given branch or the branches of the given
477 changesets.
477 changesets.
478
478
479 If `string` starts with `re:`, the remainder of the name is treated as
479 If `string` starts with `re:`, the remainder of the name is treated as
480 a regular expression. To match a branch that actually starts with `re:`,
480 a regular expression. To match a branch that actually starts with `re:`,
481 use the prefix `literal:`.
481 use the prefix `literal:`.
482 """
482 """
483 try:
483 try:
484 b = getstring(x, '')
484 b = getstring(x, '')
485 except error.ParseError:
485 except error.ParseError:
486 # not a string, but another revspec, e.g. tip()
486 # not a string, but another revspec, e.g. tip()
487 pass
487 pass
488 else:
488 else:
489 kind, pattern, matcher = _stringmatcher(b)
489 kind, pattern, matcher = _stringmatcher(b)
490 if kind == 'literal':
490 if kind == 'literal':
491 # note: falls through to the revspec case if no branch with
491 # note: falls through to the revspec case if no branch with
492 # this name exists
492 # this name exists
493 if pattern in repo.branchmap():
493 if pattern in repo.branchmap():
494 return subset.filter(lambda r: matcher(repo[r].branch()))
494 return subset.filter(lambda r: matcher(repo[r].branch()))
495 else:
495 else:
496 return subset.filter(lambda r: matcher(repo[r].branch()))
496 return subset.filter(lambda r: matcher(repo[r].branch()))
497
497
498 s = getset(repo, spanset(repo), x)
498 s = getset(repo, spanset(repo), x)
499 b = set()
499 b = set()
500 for r in s:
500 for r in s:
501 b.add(repo[r].branch())
501 b.add(repo[r].branch())
502 s = s.set()
502 s = s.set()
503 return subset.filter(lambda r: r in s or repo[r].branch() in b)
503 return subset.filter(lambda r: r in s or repo[r].branch() in b)
504
504
505 def bumped(repo, subset, x):
505 def bumped(repo, subset, x):
506 """``bumped()``
506 """``bumped()``
507 Mutable changesets marked as successors of public changesets.
507 Mutable changesets marked as successors of public changesets.
508
508
509 Only non-public and non-obsolete changesets can be `bumped`.
509 Only non-public and non-obsolete changesets can be `bumped`.
510 """
510 """
511 # i18n: "bumped" is a keyword
511 # i18n: "bumped" is a keyword
512 getargs(x, 0, 0, _("bumped takes no arguments"))
512 getargs(x, 0, 0, _("bumped takes no arguments"))
513 bumped = obsmod.getrevs(repo, 'bumped')
513 bumped = obsmod.getrevs(repo, 'bumped')
514 return subset & bumped
514 return subset & bumped
515
515
516 def bundle(repo, subset, x):
516 def bundle(repo, subset, x):
517 """``bundle()``
517 """``bundle()``
518 Changesets in the bundle.
518 Changesets in the bundle.
519
519
520 Bundle must be specified by the -R option."""
520 Bundle must be specified by the -R option."""
521
521
522 try:
522 try:
523 bundlerevs = repo.changelog.bundlerevs
523 bundlerevs = repo.changelog.bundlerevs
524 except AttributeError:
524 except AttributeError:
525 raise util.Abort(_("no bundle provided - specify with -R"))
525 raise util.Abort(_("no bundle provided - specify with -R"))
526 return subset & bundlerevs
526 return subset & bundlerevs
527
527
528 def checkstatus(repo, subset, pat, field):
528 def checkstatus(repo, subset, pat, field):
529 hasset = matchmod.patkind(pat) == 'set'
529 hasset = matchmod.patkind(pat) == 'set'
530
530
531 def matches(x):
531 def matches(x):
532 m = None
532 m = None
533 fname = None
533 fname = None
534 c = repo[x]
534 c = repo[x]
535 if not m or hasset:
535 if not m or hasset:
536 m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=c)
536 m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=c)
537 if not m.anypats() and len(m.files()) == 1:
537 if not m.anypats() and len(m.files()) == 1:
538 fname = m.files()[0]
538 fname = m.files()[0]
539 if fname is not None:
539 if fname is not None:
540 if fname not in c.files():
540 if fname not in c.files():
541 return False
541 return False
542 else:
542 else:
543 for f in c.files():
543 for f in c.files():
544 if m(f):
544 if m(f):
545 break
545 break
546 else:
546 else:
547 return False
547 return False
548 files = repo.status(c.p1().node(), c.node())[field]
548 files = repo.status(c.p1().node(), c.node())[field]
549 if fname is not None:
549 if fname is not None:
550 if fname in files:
550 if fname in files:
551 return True
551 return True
552 else:
552 else:
553 for f in files:
553 for f in files:
554 if m(f):
554 if m(f):
555 return True
555 return True
556
556
557 return subset.filter(matches)
557 return subset.filter(matches)
558
558
559 def _children(repo, narrow, parentset):
559 def _children(repo, narrow, parentset):
560 cs = set()
560 cs = set()
561 if not parentset:
561 if not parentset:
562 return baseset(cs)
562 return baseset(cs)
563 pr = repo.changelog.parentrevs
563 pr = repo.changelog.parentrevs
564 minrev = min(parentset)
564 minrev = min(parentset)
565 for r in narrow:
565 for r in narrow:
566 if r <= minrev:
566 if r <= minrev:
567 continue
567 continue
568 for p in pr(r):
568 for p in pr(r):
569 if p in parentset:
569 if p in parentset:
570 cs.add(r)
570 cs.add(r)
571 return baseset(cs)
571 return baseset(cs)
572
572
573 def children(repo, subset, x):
573 def children(repo, subset, x):
574 """``children(set)``
574 """``children(set)``
575 Child changesets of changesets in set.
575 Child changesets of changesets in set.
576 """
576 """
577 s = getset(repo, baseset(repo), x).set()
577 s = getset(repo, baseset(repo), x).set()
578 cs = _children(repo, subset, s)
578 cs = _children(repo, subset, s)
579 return subset & cs
579 return subset & cs
580
580
581 def closed(repo, subset, x):
581 def closed(repo, subset, x):
582 """``closed()``
582 """``closed()``
583 Changeset is closed.
583 Changeset is closed.
584 """
584 """
585 # i18n: "closed" is a keyword
585 # i18n: "closed" is a keyword
586 getargs(x, 0, 0, _("closed takes no arguments"))
586 getargs(x, 0, 0, _("closed takes no arguments"))
587 return subset.filter(lambda r: repo[r].closesbranch())
587 return subset.filter(lambda r: repo[r].closesbranch())
588
588
589 def contains(repo, subset, x):
589 def contains(repo, subset, x):
590 """``contains(pattern)``
590 """``contains(pattern)``
591 The revision's manifest contains a file matching pattern (but might not
591 The revision's manifest contains a file matching pattern (but might not
592 modify it). See :hg:`help patterns` for information about file patterns.
592 modify it). See :hg:`help patterns` for information about file patterns.
593
593
594 The pattern without explicit kind like ``glob:`` is expected to be
594 The pattern without explicit kind like ``glob:`` is expected to be
595 relative to the current directory and match against a file exactly
595 relative to the current directory and match against a file exactly
596 for efficiency.
596 for efficiency.
597 """
597 """
598 # i18n: "contains" is a keyword
598 # i18n: "contains" is a keyword
599 pat = getstring(x, _("contains requires a pattern"))
599 pat = getstring(x, _("contains requires a pattern"))
600
600
601 def matches(x):
601 def matches(x):
602 if not matchmod.patkind(pat):
602 if not matchmod.patkind(pat):
603 pats = pathutil.canonpath(repo.root, repo.getcwd(), pat)
603 pats = pathutil.canonpath(repo.root, repo.getcwd(), pat)
604 if pats in repo[x]:
604 if pats in repo[x]:
605 return True
605 return True
606 else:
606 else:
607 c = repo[x]
607 c = repo[x]
608 m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=c)
608 m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=c)
609 for f in c.manifest():
609 for f in c.manifest():
610 if m(f):
610 if m(f):
611 return True
611 return True
612 return False
612 return False
613
613
614 return subset.filter(matches)
614 return subset.filter(matches)
615
615
616 def converted(repo, subset, x):
616 def converted(repo, subset, x):
617 """``converted([id])``
617 """``converted([id])``
618 Changesets converted from the given identifier in the old repository if
618 Changesets converted from the given identifier in the old repository if
619 present, or all converted changesets if no identifier is specified.
619 present, or all converted changesets if no identifier is specified.
620 """
620 """
621
621
622 # There is exactly no chance of resolving the revision, so do a simple
622 # There is exactly no chance of resolving the revision, so do a simple
623 # string compare and hope for the best
623 # string compare and hope for the best
624
624
625 rev = None
625 rev = None
626 # i18n: "converted" is a keyword
626 # i18n: "converted" is a keyword
627 l = getargs(x, 0, 1, _('converted takes one or no arguments'))
627 l = getargs(x, 0, 1, _('converted takes one or no arguments'))
628 if l:
628 if l:
629 # i18n: "converted" is a keyword
629 # i18n: "converted" is a keyword
630 rev = getstring(l[0], _('converted requires a revision'))
630 rev = getstring(l[0], _('converted requires a revision'))
631
631
632 def _matchvalue(r):
632 def _matchvalue(r):
633 source = repo[r].extra().get('convert_revision', None)
633 source = repo[r].extra().get('convert_revision', None)
634 return source is not None and (rev is None or source.startswith(rev))
634 return source is not None and (rev is None or source.startswith(rev))
635
635
636 return subset.filter(lambda r: _matchvalue(r))
636 return subset.filter(lambda r: _matchvalue(r))
637
637
638 def date(repo, subset, x):
638 def date(repo, subset, x):
639 """``date(interval)``
639 """``date(interval)``
640 Changesets within the interval, see :hg:`help dates`.
640 Changesets within the interval, see :hg:`help dates`.
641 """
641 """
642 # i18n: "date" is a keyword
642 # i18n: "date" is a keyword
643 ds = getstring(x, _("date requires a string"))
643 ds = getstring(x, _("date requires a string"))
644 dm = util.matchdate(ds)
644 dm = util.matchdate(ds)
645 return subset.filter(lambda x: dm(repo[x].date()[0]))
645 return subset.filter(lambda x: dm(repo[x].date()[0]))
646
646
647 def desc(repo, subset, x):
647 def desc(repo, subset, x):
648 """``desc(string)``
648 """``desc(string)``
649 Search commit message for string. The match is case-insensitive.
649 Search commit message for string. The match is case-insensitive.
650 """
650 """
651 # i18n: "desc" is a keyword
651 # i18n: "desc" is a keyword
652 ds = encoding.lower(getstring(x, _("desc requires a string")))
652 ds = encoding.lower(getstring(x, _("desc requires a string")))
653
653
654 def matches(x):
654 def matches(x):
655 c = repo[x]
655 c = repo[x]
656 return ds in encoding.lower(c.description())
656 return ds in encoding.lower(c.description())
657
657
658 return subset.filter(matches)
658 return subset.filter(matches)
659
659
660 def _descendants(repo, subset, x, followfirst=False):
660 def _descendants(repo, subset, x, followfirst=False):
661 args = getset(repo, spanset(repo), x)
661 args = getset(repo, spanset(repo), x)
662 if not args:
662 if not args:
663 return baseset([])
663 return baseset([])
664 s = _revdescendants(repo, args, followfirst)
664 s = _revdescendants(repo, args, followfirst)
665
665
666 # Both sets need to be ascending in order to lazily return the union
666 # Both sets need to be ascending in order to lazily return the union
667 # in the correct order.
667 # in the correct order.
668 args.ascending()
668 args.ascending()
669 result = (orderedlazyset(s, subset.__contains__, ascending=True) +
669 result = (orderedlazyset(s, subset.__contains__, ascending=True) +
670 orderedlazyset(args, subset.__contains__, ascending=True))
670 orderedlazyset(args, subset.__contains__, ascending=True))
671
671
672 # Wrap result in a lazyset since it's an _addset, which doesn't implement
672 # Wrap result in a lazyset since it's an _addset, which doesn't implement
673 # all the necessary functions to be consumed by callers.
673 # all the necessary functions to be consumed by callers.
674 return orderedlazyset(result, lambda r: True, ascending=True)
674 return orderedlazyset(result, lambda r: True, ascending=True)
675
675
676 def descendants(repo, subset, x):
676 def descendants(repo, subset, x):
677 """``descendants(set)``
677 """``descendants(set)``
678 Changesets which are descendants of changesets in set.
678 Changesets which are descendants of changesets in set.
679 """
679 """
680 return _descendants(repo, subset, x)
680 return _descendants(repo, subset, x)
681
681
682 def _firstdescendants(repo, subset, x):
682 def _firstdescendants(repo, subset, x):
683 # ``_firstdescendants(set)``
683 # ``_firstdescendants(set)``
684 # Like ``descendants(set)`` but follows only the first parents.
684 # Like ``descendants(set)`` but follows only the first parents.
685 return _descendants(repo, subset, x, followfirst=True)
685 return _descendants(repo, subset, x, followfirst=True)
686
686
687 def destination(repo, subset, x):
687 def destination(repo, subset, x):
688 """``destination([set])``
688 """``destination([set])``
689 Changesets that were created by a graft, transplant or rebase operation,
689 Changesets that were created by a graft, transplant or rebase operation,
690 with the given revisions specified as the source. Omitting the optional set
690 with the given revisions specified as the source. Omitting the optional set
691 is the same as passing all().
691 is the same as passing all().
692 """
692 """
693 if x is not None:
693 if x is not None:
694 args = getset(repo, spanset(repo), x).set()
694 args = getset(repo, spanset(repo), x).set()
695 else:
695 else:
696 args = getall(repo, spanset(repo), x).set()
696 args = getall(repo, spanset(repo), x).set()
697
697
698 dests = set()
698 dests = set()
699
699
700 # subset contains all of the possible destinations that can be returned, so
700 # subset contains all of the possible destinations that can be returned, so
701 # iterate over them and see if their source(s) were provided in the args.
701 # iterate over them and see if their source(s) were provided in the args.
702 # Even if the immediate src of r is not in the args, src's source (or
702 # Even if the immediate src of r is not in the args, src's source (or
703 # further back) may be. Scanning back further than the immediate src allows
703 # further back) may be. Scanning back further than the immediate src allows
704 # transitive transplants and rebases to yield the same results as transitive
704 # transitive transplants and rebases to yield the same results as transitive
705 # grafts.
705 # grafts.
706 for r in subset:
706 for r in subset:
707 src = _getrevsource(repo, r)
707 src = _getrevsource(repo, r)
708 lineage = None
708 lineage = None
709
709
710 while src is not None:
710 while src is not None:
711 if lineage is None:
711 if lineage is None:
712 lineage = list()
712 lineage = list()
713
713
714 lineage.append(r)
714 lineage.append(r)
715
715
716 # The visited lineage is a match if the current source is in the arg
716 # The visited lineage is a match if the current source is in the arg
717 # set. Since every candidate dest is visited by way of iterating
717 # set. Since every candidate dest is visited by way of iterating
718 # subset, any dests further back in the lineage will be tested by a
718 # subset, any dests further back in the lineage will be tested by a
719 # different iteration over subset. Likewise, if the src was already
719 # different iteration over subset. Likewise, if the src was already
720 # selected, the current lineage can be selected without going back
720 # selected, the current lineage can be selected without going back
721 # further.
721 # further.
722 if src in args or src in dests:
722 if src in args or src in dests:
723 dests.update(lineage)
723 dests.update(lineage)
724 break
724 break
725
725
726 r = src
726 r = src
727 src = _getrevsource(repo, r)
727 src = _getrevsource(repo, r)
728
728
729 return subset.filter(dests.__contains__)
729 return subset.filter(dests.__contains__)
730
730
731 def divergent(repo, subset, x):
731 def divergent(repo, subset, x):
732 """``divergent()``
732 """``divergent()``
733 Final successors of changesets with an alternative set of final successors.
733 Final successors of changesets with an alternative set of final successors.
734 """
734 """
735 # i18n: "divergent" is a keyword
735 # i18n: "divergent" is a keyword
736 getargs(x, 0, 0, _("divergent takes no arguments"))
736 getargs(x, 0, 0, _("divergent takes no arguments"))
737 divergent = obsmod.getrevs(repo, 'divergent')
737 divergent = obsmod.getrevs(repo, 'divergent')
738 return subset.filter(divergent.__contains__)
738 return subset.filter(divergent.__contains__)
739
739
740 def draft(repo, subset, x):
740 def draft(repo, subset, x):
741 """``draft()``
741 """``draft()``
742 Changeset in draft phase."""
742 Changeset in draft phase."""
743 # i18n: "draft" is a keyword
743 # i18n: "draft" is a keyword
744 getargs(x, 0, 0, _("draft takes no arguments"))
744 getargs(x, 0, 0, _("draft takes no arguments"))
745 pc = repo._phasecache
745 pc = repo._phasecache
746 return subset.filter(lambda r: pc.phase(repo, r) == phases.draft)
746 return subset.filter(lambda r: pc.phase(repo, r) == phases.draft)
747
747
748 def extinct(repo, subset, x):
748 def extinct(repo, subset, x):
749 """``extinct()``
749 """``extinct()``
750 Obsolete changesets with obsolete descendants only.
750 Obsolete changesets with obsolete descendants only.
751 """
751 """
752 # i18n: "extinct" is a keyword
752 # i18n: "extinct" is a keyword
753 getargs(x, 0, 0, _("extinct takes no arguments"))
753 getargs(x, 0, 0, _("extinct takes no arguments"))
754 extincts = obsmod.getrevs(repo, 'extinct')
754 extincts = obsmod.getrevs(repo, 'extinct')
755 return subset & extincts
755 return subset & extincts
756
756
757 def extra(repo, subset, x):
757 def extra(repo, subset, x):
758 """``extra(label, [value])``
758 """``extra(label, [value])``
759 Changesets with the given label in the extra metadata, with the given
759 Changesets with the given label in the extra metadata, with the given
760 optional value.
760 optional value.
761
761
762 If `value` starts with `re:`, the remainder of the value is treated as
762 If `value` starts with `re:`, the remainder of the value is treated as
763 a regular expression. To match a value that actually starts with `re:`,
763 a regular expression. To match a value that actually starts with `re:`,
764 use the prefix `literal:`.
764 use the prefix `literal:`.
765 """
765 """
766
766
767 # i18n: "extra" is a keyword
767 # i18n: "extra" is a keyword
768 l = getargs(x, 1, 2, _('extra takes at least 1 and at most 2 arguments'))
768 l = getargs(x, 1, 2, _('extra takes at least 1 and at most 2 arguments'))
769 # i18n: "extra" is a keyword
769 # i18n: "extra" is a keyword
770 label = getstring(l[0], _('first argument to extra must be a string'))
770 label = getstring(l[0], _('first argument to extra must be a string'))
771 value = None
771 value = None
772
772
773 if len(l) > 1:
773 if len(l) > 1:
774 # i18n: "extra" is a keyword
774 # i18n: "extra" is a keyword
775 value = getstring(l[1], _('second argument to extra must be a string'))
775 value = getstring(l[1], _('second argument to extra must be a string'))
776 kind, value, matcher = _stringmatcher(value)
776 kind, value, matcher = _stringmatcher(value)
777
777
778 def _matchvalue(r):
778 def _matchvalue(r):
779 extra = repo[r].extra()
779 extra = repo[r].extra()
780 return label in extra and (value is None or matcher(extra[label]))
780 return label in extra and (value is None or matcher(extra[label]))
781
781
782 return subset.filter(lambda r: _matchvalue(r))
782 return subset.filter(lambda r: _matchvalue(r))
783
783
784 def filelog(repo, subset, x):
784 def filelog(repo, subset, x):
785 """``filelog(pattern)``
785 """``filelog(pattern)``
786 Changesets connected to the specified filelog.
786 Changesets connected to the specified filelog.
787
787
788 For performance reasons, visits only revisions mentioned in the file-level
788 For performance reasons, visits only revisions mentioned in the file-level
789 filelog, rather than filtering through all changesets (much faster, but
789 filelog, rather than filtering through all changesets (much faster, but
790 doesn't include deletes or duplicate changes). For a slower, more accurate
790 doesn't include deletes or duplicate changes). For a slower, more accurate
791 result, use ``file()``.
791 result, use ``file()``.
792
792
793 The pattern without explicit kind like ``glob:`` is expected to be
793 The pattern without explicit kind like ``glob:`` is expected to be
794 relative to the current directory and match against a file exactly
794 relative to the current directory and match against a file exactly
795 for efficiency.
795 for efficiency.
796 """
796 """
797
797
798 # i18n: "filelog" is a keyword
798 # i18n: "filelog" is a keyword
799 pat = getstring(x, _("filelog requires a pattern"))
799 pat = getstring(x, _("filelog requires a pattern"))
800 s = set()
800 s = set()
801
801
802 if not matchmod.patkind(pat):
802 if not matchmod.patkind(pat):
803 f = pathutil.canonpath(repo.root, repo.getcwd(), pat)
803 f = pathutil.canonpath(repo.root, repo.getcwd(), pat)
804 fl = repo.file(f)
804 fl = repo.file(f)
805 for fr in fl:
805 for fr in fl:
806 s.add(fl.linkrev(fr))
806 s.add(fl.linkrev(fr))
807 else:
807 else:
808 m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=repo[None])
808 m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=repo[None])
809 for f in repo[None]:
809 for f in repo[None]:
810 if m(f):
810 if m(f):
811 fl = repo.file(f)
811 fl = repo.file(f)
812 for fr in fl:
812 for fr in fl:
813 s.add(fl.linkrev(fr))
813 s.add(fl.linkrev(fr))
814
814
815 return subset.filter(s.__contains__)
815 return subset.filter(s.__contains__)
816
816
817 def first(repo, subset, x):
817 def first(repo, subset, x):
818 """``first(set, [n])``
818 """``first(set, [n])``
819 An alias for limit().
819 An alias for limit().
820 """
820 """
821 return limit(repo, subset, x)
821 return limit(repo, subset, x)
822
822
823 def _follow(repo, subset, x, name, followfirst=False):
823 def _follow(repo, subset, x, name, followfirst=False):
824 l = getargs(x, 0, 1, _("%s takes no arguments or a filename") % name)
824 l = getargs(x, 0, 1, _("%s takes no arguments or a filename") % name)
825 c = repo['.']
825 c = repo['.']
826 if l:
826 if l:
827 x = getstring(l[0], _("%s expected a filename") % name)
827 x = getstring(l[0], _("%s expected a filename") % name)
828 if x in c:
828 if x in c:
829 cx = c[x]
829 cx = c[x]
830 s = set(ctx.rev() for ctx in cx.ancestors(followfirst=followfirst))
830 s = set(ctx.rev() for ctx in cx.ancestors(followfirst=followfirst))
831 # include the revision responsible for the most recent version
831 # include the revision responsible for the most recent version
832 s.add(cx.linkrev())
832 s.add(cx.linkrev())
833 else:
833 else:
834 return baseset([])
834 return baseset([])
835 else:
835 else:
836 s = _revancestors(repo, baseset([c.rev()]), followfirst)
836 s = _revancestors(repo, baseset([c.rev()]), followfirst)
837
837
838 return subset.filter(s.__contains__)
838 return subset.filter(s.__contains__)
839
839
840 def follow(repo, subset, x):
840 def follow(repo, subset, x):
841 """``follow([file])``
841 """``follow([file])``
842 An alias for ``::.`` (ancestors of the working copy's first parent).
842 An alias for ``::.`` (ancestors of the working copy's first parent).
843 If a filename is specified, the history of the given file is followed,
843 If a filename is specified, the history of the given file is followed,
844 including copies.
844 including copies.
845 """
845 """
846 return _follow(repo, subset, x, 'follow')
846 return _follow(repo, subset, x, 'follow')
847
847
848 def _followfirst(repo, subset, x):
848 def _followfirst(repo, subset, x):
849 # ``followfirst([file])``
849 # ``followfirst([file])``
850 # Like ``follow([file])`` but follows only the first parent of
850 # Like ``follow([file])`` but follows only the first parent of
851 # every revision or file revision.
851 # every revision or file revision.
852 return _follow(repo, subset, x, '_followfirst', followfirst=True)
852 return _follow(repo, subset, x, '_followfirst', followfirst=True)
853
853
854 def getall(repo, subset, x):
854 def getall(repo, subset, x):
855 """``all()``
855 """``all()``
856 All changesets, the same as ``0:tip``.
856 All changesets, the same as ``0:tip``.
857 """
857 """
858 # i18n: "all" is a keyword
858 # i18n: "all" is a keyword
859 getargs(x, 0, 0, _("all takes no arguments"))
859 getargs(x, 0, 0, _("all takes no arguments"))
860 return subset
860 return subset
861
861
862 def grep(repo, subset, x):
862 def grep(repo, subset, x):
863 """``grep(regex)``
863 """``grep(regex)``
864 Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``
864 Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``
865 to ensure special escape characters are handled correctly. Unlike
865 to ensure special escape characters are handled correctly. Unlike
866 ``keyword(string)``, the match is case-sensitive.
866 ``keyword(string)``, the match is case-sensitive.
867 """
867 """
868 try:
868 try:
869 # i18n: "grep" is a keyword
869 # i18n: "grep" is a keyword
870 gr = re.compile(getstring(x, _("grep requires a string")))
870 gr = re.compile(getstring(x, _("grep requires a string")))
871 except re.error, e:
871 except re.error, e:
872 raise error.ParseError(_('invalid match pattern: %s') % e)
872 raise error.ParseError(_('invalid match pattern: %s') % e)
873
873
874 def matches(x):
874 def matches(x):
875 c = repo[x]
875 c = repo[x]
876 for e in c.files() + [c.user(), c.description()]:
876 for e in c.files() + [c.user(), c.description()]:
877 if gr.search(e):
877 if gr.search(e):
878 return True
878 return True
879 return False
879 return False
880
880
881 return subset.filter(matches)
881 return subset.filter(matches)
882
882
883 def _matchfiles(repo, subset, x):
883 def _matchfiles(repo, subset, x):
884 # _matchfiles takes a revset list of prefixed arguments:
884 # _matchfiles takes a revset list of prefixed arguments:
885 #
885 #
886 # [p:foo, i:bar, x:baz]
886 # [p:foo, i:bar, x:baz]
887 #
887 #
888 # builds a match object from them and filters subset. Allowed
888 # builds a match object from them and filters subset. Allowed
889 # prefixes are 'p:' for regular patterns, 'i:' for include
889 # prefixes are 'p:' for regular patterns, 'i:' for include
890 # patterns and 'x:' for exclude patterns. Use 'r:' prefix to pass
890 # patterns and 'x:' for exclude patterns. Use 'r:' prefix to pass
891 # a revision identifier, or the empty string to reference the
891 # a revision identifier, or the empty string to reference the
892 # working directory, from which the match object is
892 # working directory, from which the match object is
893 # initialized. Use 'd:' to set the default matching mode, default
893 # initialized. Use 'd:' to set the default matching mode, default
894 # to 'glob'. At most one 'r:' and 'd:' argument can be passed.
894 # to 'glob'. At most one 'r:' and 'd:' argument can be passed.
895
895
896 # i18n: "_matchfiles" is a keyword
896 # i18n: "_matchfiles" is a keyword
897 l = getargs(x, 1, -1, _("_matchfiles requires at least one argument"))
897 l = getargs(x, 1, -1, _("_matchfiles requires at least one argument"))
898 pats, inc, exc = [], [], []
898 pats, inc, exc = [], [], []
899 hasset = False
899 hasset = False
900 rev, default = None, None
900 rev, default = None, None
901 for arg in l:
901 for arg in l:
902 # i18n: "_matchfiles" is a keyword
902 # i18n: "_matchfiles" is a keyword
903 s = getstring(arg, _("_matchfiles requires string arguments"))
903 s = getstring(arg, _("_matchfiles requires string arguments"))
904 prefix, value = s[:2], s[2:]
904 prefix, value = s[:2], s[2:]
905 if prefix == 'p:':
905 if prefix == 'p:':
906 pats.append(value)
906 pats.append(value)
907 elif prefix == 'i:':
907 elif prefix == 'i:':
908 inc.append(value)
908 inc.append(value)
909 elif prefix == 'x:':
909 elif prefix == 'x:':
910 exc.append(value)
910 exc.append(value)
911 elif prefix == 'r:':
911 elif prefix == 'r:':
912 if rev is not None:
912 if rev is not None:
913 # i18n: "_matchfiles" is a keyword
913 # i18n: "_matchfiles" is a keyword
914 raise error.ParseError(_('_matchfiles expected at most one '
914 raise error.ParseError(_('_matchfiles expected at most one '
915 'revision'))
915 'revision'))
916 rev = value
916 rev = value
917 elif prefix == 'd:':
917 elif prefix == 'd:':
918 if default is not None:
918 if default is not None:
919 # i18n: "_matchfiles" is a keyword
919 # i18n: "_matchfiles" is a keyword
920 raise error.ParseError(_('_matchfiles expected at most one '
920 raise error.ParseError(_('_matchfiles expected at most one '
921 'default mode'))
921 'default mode'))
922 default = value
922 default = value
923 else:
923 else:
924 # i18n: "_matchfiles" is a keyword
924 # i18n: "_matchfiles" is a keyword
925 raise error.ParseError(_('invalid _matchfiles prefix: %s') % prefix)
925 raise error.ParseError(_('invalid _matchfiles prefix: %s') % prefix)
926 if not hasset and matchmod.patkind(value) == 'set':
926 if not hasset and matchmod.patkind(value) == 'set':
927 hasset = True
927 hasset = True
928 if not default:
928 if not default:
929 default = 'glob'
929 default = 'glob'
930
930
931 def matches(x):
931 def matches(x):
932 m = None
932 m = None
933 c = repo[x]
933 c = repo[x]
934 if not m or (hasset and rev is None):
934 if not m or (hasset and rev is None):
935 ctx = c
935 ctx = c
936 if rev is not None:
936 if rev is not None:
937 ctx = repo[rev or None]
937 ctx = repo[rev or None]
938 m = matchmod.match(repo.root, repo.getcwd(), pats, include=inc,
938 m = matchmod.match(repo.root, repo.getcwd(), pats, include=inc,
939 exclude=exc, ctx=ctx, default=default)
939 exclude=exc, ctx=ctx, default=default)
940 for f in c.files():
940 for f in c.files():
941 if m(f):
941 if m(f):
942 return True
942 return True
943 return False
943 return False
944
944
945 return subset.filter(matches)
945 return subset.filter(matches)
946
946
947 def hasfile(repo, subset, x):
947 def hasfile(repo, subset, x):
948 """``file(pattern)``
948 """``file(pattern)``
949 Changesets affecting files matched by pattern.
949 Changesets affecting files matched by pattern.
950
950
951 For a faster but less accurate result, consider using ``filelog()``
951 For a faster but less accurate result, consider using ``filelog()``
952 instead.
952 instead.
953
953
954 This predicate uses ``glob:`` as the default kind of pattern.
954 This predicate uses ``glob:`` as the default kind of pattern.
955 """
955 """
956 # i18n: "file" is a keyword
956 # i18n: "file" is a keyword
957 pat = getstring(x, _("file requires a pattern"))
957 pat = getstring(x, _("file requires a pattern"))
958 return _matchfiles(repo, subset, ('string', 'p:' + pat))
958 return _matchfiles(repo, subset, ('string', 'p:' + pat))
959
959
960 def head(repo, subset, x):
960 def head(repo, subset, x):
961 """``head()``
961 """``head()``
962 Changeset is a named branch head.
962 Changeset is a named branch head.
963 """
963 """
964 # i18n: "head" is a keyword
964 # i18n: "head" is a keyword
965 getargs(x, 0, 0, _("head takes no arguments"))
965 getargs(x, 0, 0, _("head takes no arguments"))
966 hs = set()
966 hs = set()
967 for b, ls in repo.branchmap().iteritems():
967 for b, ls in repo.branchmap().iteritems():
968 hs.update(repo[h].rev() for h in ls)
968 hs.update(repo[h].rev() for h in ls)
969 return baseset(hs).filter(subset.__contains__)
969 return baseset(hs).filter(subset.__contains__)
970
970
971 def heads(repo, subset, x):
971 def heads(repo, subset, x):
972 """``heads(set)``
972 """``heads(set)``
973 Members of set with no children in set.
973 Members of set with no children in set.
974 """
974 """
975 s = getset(repo, subset, x)
975 s = getset(repo, subset, x)
976 ps = parents(repo, subset, x)
976 ps = parents(repo, subset, x)
977 return s - ps
977 return s - ps
978
978
979 def hidden(repo, subset, x):
979 def hidden(repo, subset, x):
980 """``hidden()``
980 """``hidden()``
981 Hidden changesets.
981 Hidden changesets.
982 """
982 """
983 # i18n: "hidden" is a keyword
983 # i18n: "hidden" is a keyword
984 getargs(x, 0, 0, _("hidden takes no arguments"))
984 getargs(x, 0, 0, _("hidden takes no arguments"))
985 hiddenrevs = repoview.filterrevs(repo, 'visible')
985 hiddenrevs = repoview.filterrevs(repo, 'visible')
986 return subset & hiddenrevs
986 return subset & hiddenrevs
987
987
988 def keyword(repo, subset, x):
988 def keyword(repo, subset, x):
989 """``keyword(string)``
989 """``keyword(string)``
990 Search commit message, user name, and names of changed files for
990 Search commit message, user name, and names of changed files for
991 string. The match is case-insensitive.
991 string. The match is case-insensitive.
992 """
992 """
993 # i18n: "keyword" is a keyword
993 # i18n: "keyword" is a keyword
994 kw = encoding.lower(getstring(x, _("keyword requires a string")))
994 kw = encoding.lower(getstring(x, _("keyword requires a string")))
995
995
996 def matches(r):
996 def matches(r):
997 c = repo[r]
997 c = repo[r]
998 return util.any(kw in encoding.lower(t) for t in c.files() + [c.user(),
998 return util.any(kw in encoding.lower(t) for t in c.files() + [c.user(),
999 c.description()])
999 c.description()])
1000
1000
1001 return subset.filter(matches)
1001 return subset.filter(matches)
1002
1002
1003 def limit(repo, subset, x):
1003 def limit(repo, subset, x):
1004 """``limit(set, [n])``
1004 """``limit(set, [n])``
1005 First n members of set, defaulting to 1.
1005 First n members of set, defaulting to 1.
1006 """
1006 """
1007 # i18n: "limit" is a keyword
1007 # i18n: "limit" is a keyword
1008 l = getargs(x, 1, 2, _("limit requires one or two arguments"))
1008 l = getargs(x, 1, 2, _("limit requires one or two arguments"))
1009 try:
1009 try:
1010 lim = 1
1010 lim = 1
1011 if len(l) == 2:
1011 if len(l) == 2:
1012 # i18n: "limit" is a keyword
1012 # i18n: "limit" is a keyword
1013 lim = int(getstring(l[1], _("limit requires a number")))
1013 lim = int(getstring(l[1], _("limit requires a number")))
1014 except (TypeError, ValueError):
1014 except (TypeError, ValueError):
1015 # i18n: "limit" is a keyword
1015 # i18n: "limit" is a keyword
1016 raise error.ParseError(_("limit expects a number"))
1016 raise error.ParseError(_("limit expects a number"))
1017 ss = subset.set()
1017 ss = subset.set()
1018 os = getset(repo, spanset(repo), l[0])
1018 os = getset(repo, spanset(repo), l[0])
1019 bs = baseset([])
1019 bs = baseset([])
1020 it = iter(os)
1020 it = iter(os)
1021 for x in xrange(lim):
1021 for x in xrange(lim):
1022 try:
1022 try:
1023 y = it.next()
1023 y = it.next()
1024 if y in ss:
1024 if y in ss:
1025 bs.append(y)
1025 bs.append(y)
1026 except (StopIteration):
1026 except (StopIteration):
1027 break
1027 break
1028 return bs
1028 return bs
1029
1029
1030 def last(repo, subset, x):
1030 def last(repo, subset, x):
1031 """``last(set, [n])``
1031 """``last(set, [n])``
1032 Last n members of set, defaulting to 1.
1032 Last n members of set, defaulting to 1.
1033 """
1033 """
1034 # i18n: "last" is a keyword
1034 # i18n: "last" is a keyword
1035 l = getargs(x, 1, 2, _("last requires one or two arguments"))
1035 l = getargs(x, 1, 2, _("last requires one or two arguments"))
1036 try:
1036 try:
1037 lim = 1
1037 lim = 1
1038 if len(l) == 2:
1038 if len(l) == 2:
1039 # i18n: "last" is a keyword
1039 # i18n: "last" is a keyword
1040 lim = int(getstring(l[1], _("last requires a number")))
1040 lim = int(getstring(l[1], _("last requires a number")))
1041 except (TypeError, ValueError):
1041 except (TypeError, ValueError):
1042 # i18n: "last" is a keyword
1042 # i18n: "last" is a keyword
1043 raise error.ParseError(_("last expects a number"))
1043 raise error.ParseError(_("last expects a number"))
1044 ss = subset.set()
1044 ss = subset.set()
1045 os = getset(repo, spanset(repo), l[0])
1045 os = getset(repo, spanset(repo), l[0])
1046 os.reverse()
1046 os.reverse()
1047 bs = baseset([])
1047 bs = baseset([])
1048 it = iter(os)
1048 it = iter(os)
1049 for x in xrange(lim):
1049 for x in xrange(lim):
1050 try:
1050 try:
1051 y = it.next()
1051 y = it.next()
1052 if y in ss:
1052 if y in ss:
1053 bs.append(y)
1053 bs.append(y)
1054 except (StopIteration):
1054 except (StopIteration):
1055 break
1055 break
1056 return bs
1056 return bs
1057
1057
1058 def maxrev(repo, subset, x):
1058 def maxrev(repo, subset, x):
1059 """``max(set)``
1059 """``max(set)``
1060 Changeset with highest revision number in set.
1060 Changeset with highest revision number in set.
1061 """
1061 """
1062 os = getset(repo, spanset(repo), x)
1062 os = getset(repo, spanset(repo), x)
1063 if os:
1063 if os:
1064 m = os.max()
1064 m = os.max()
1065 if m in subset:
1065 if m in subset:
1066 return baseset([m])
1066 return baseset([m])
1067 return baseset([])
1067 return baseset([])
1068
1068
1069 def merge(repo, subset, x):
1069 def merge(repo, subset, x):
1070 """``merge()``
1070 """``merge()``
1071 Changeset is a merge changeset.
1071 Changeset is a merge changeset.
1072 """
1072 """
1073 # i18n: "merge" is a keyword
1073 # i18n: "merge" is a keyword
1074 getargs(x, 0, 0, _("merge takes no arguments"))
1074 getargs(x, 0, 0, _("merge takes no arguments"))
1075 cl = repo.changelog
1075 cl = repo.changelog
1076 return subset.filter(lambda r: cl.parentrevs(r)[1] != -1)
1076 return subset.filter(lambda r: cl.parentrevs(r)[1] != -1)
1077
1077
1078 def branchpoint(repo, subset, x):
1078 def branchpoint(repo, subset, x):
1079 """``branchpoint()``
1079 """``branchpoint()``
1080 Changesets with more than one child.
1080 Changesets with more than one child.
1081 """
1081 """
1082 # i18n: "branchpoint" is a keyword
1082 # i18n: "branchpoint" is a keyword
1083 getargs(x, 0, 0, _("branchpoint takes no arguments"))
1083 getargs(x, 0, 0, _("branchpoint takes no arguments"))
1084 cl = repo.changelog
1084 cl = repo.changelog
1085 if not subset:
1085 if not subset:
1086 return baseset([])
1086 return baseset([])
1087 baserev = min(subset)
1087 baserev = min(subset)
1088 parentscount = [0]*(len(repo) - baserev)
1088 parentscount = [0]*(len(repo) - baserev)
1089 for r in cl.revs(start=baserev + 1):
1089 for r in cl.revs(start=baserev + 1):
1090 for p in cl.parentrevs(r):
1090 for p in cl.parentrevs(r):
1091 if p >= baserev:
1091 if p >= baserev:
1092 parentscount[p - baserev] += 1
1092 parentscount[p - baserev] += 1
1093 return subset.filter(lambda r: parentscount[r - baserev] > 1)
1093 return subset.filter(lambda r: parentscount[r - baserev] > 1)
1094
1094
1095 def minrev(repo, subset, x):
1095 def minrev(repo, subset, x):
1096 """``min(set)``
1096 """``min(set)``
1097 Changeset with lowest revision number in set.
1097 Changeset with lowest revision number in set.
1098 """
1098 """
1099 os = getset(repo, spanset(repo), x)
1099 os = getset(repo, spanset(repo), x)
1100 if os:
1100 if os:
1101 m = os.min()
1101 m = os.min()
1102 if m in subset:
1102 if m in subset:
1103 return baseset([m])
1103 return baseset([m])
1104 return baseset([])
1104 return baseset([])
1105
1105
1106 def modifies(repo, subset, x):
1106 def modifies(repo, subset, x):
1107 """``modifies(pattern)``
1107 """``modifies(pattern)``
1108 Changesets modifying files matched by pattern.
1108 Changesets modifying files matched by pattern.
1109
1109
1110 The pattern without explicit kind like ``glob:`` is expected to be
1110 The pattern without explicit kind like ``glob:`` is expected to be
1111 relative to the current directory and match against a file or a
1111 relative to the current directory and match against a file or a
1112 directory.
1112 directory.
1113 """
1113 """
1114 # i18n: "modifies" is a keyword
1114 # i18n: "modifies" is a keyword
1115 pat = getstring(x, _("modifies requires a pattern"))
1115 pat = getstring(x, _("modifies requires a pattern"))
1116 return checkstatus(repo, subset, pat, 0)
1116 return checkstatus(repo, subset, pat, 0)
1117
1117
1118 def node_(repo, subset, x):
1118 def node_(repo, subset, x):
1119 """``id(string)``
1119 """``id(string)``
1120 Revision non-ambiguously specified by the given hex string prefix.
1120 Revision non-ambiguously specified by the given hex string prefix.
1121 """
1121 """
1122 # i18n: "id" is a keyword
1122 # i18n: "id" is a keyword
1123 l = getargs(x, 1, 1, _("id requires one argument"))
1123 l = getargs(x, 1, 1, _("id requires one argument"))
1124 # i18n: "id" is a keyword
1124 # i18n: "id" is a keyword
1125 n = getstring(l[0], _("id requires a string"))
1125 n = getstring(l[0], _("id requires a string"))
1126 if len(n) == 40:
1126 if len(n) == 40:
1127 rn = repo[n].rev()
1127 rn = repo[n].rev()
1128 else:
1128 else:
1129 rn = None
1129 rn = None
1130 pm = repo.changelog._partialmatch(n)
1130 pm = repo.changelog._partialmatch(n)
1131 if pm is not None:
1131 if pm is not None:
1132 rn = repo.changelog.rev(pm)
1132 rn = repo.changelog.rev(pm)
1133
1133
1134 return subset.filter(lambda r: r == rn)
1134 return subset.filter(lambda r: r == rn)
1135
1135
1136 def obsolete(repo, subset, x):
1136 def obsolete(repo, subset, x):
1137 """``obsolete()``
1137 """``obsolete()``
1138 Mutable changeset with a newer version."""
1138 Mutable changeset with a newer version."""
1139 # i18n: "obsolete" is a keyword
1139 # i18n: "obsolete" is a keyword
1140 getargs(x, 0, 0, _("obsolete takes no arguments"))
1140 getargs(x, 0, 0, _("obsolete takes no arguments"))
1141 obsoletes = obsmod.getrevs(repo, 'obsolete')
1141 obsoletes = obsmod.getrevs(repo, 'obsolete')
1142 return subset & obsoletes
1142 return subset & obsoletes
1143
1143
1144 def origin(repo, subset, x):
1144 def origin(repo, subset, x):
1145 """``origin([set])``
1145 """``origin([set])``
1146 Changesets that were specified as a source for the grafts, transplants or
1146 Changesets that were specified as a source for the grafts, transplants or
1147 rebases that created the given revisions. Omitting the optional set is the
1147 rebases that created the given revisions. Omitting the optional set is the
1148 same as passing all(). If a changeset created by these operations is itself
1148 same as passing all(). If a changeset created by these operations is itself
1149 specified as a source for one of these operations, only the source changeset
1149 specified as a source for one of these operations, only the source changeset
1150 for the first operation is selected.
1150 for the first operation is selected.
1151 """
1151 """
1152 if x is not None:
1152 if x is not None:
1153 args = getset(repo, spanset(repo), x).set()
1153 args = getset(repo, spanset(repo), x).set()
1154 else:
1154 else:
1155 args = getall(repo, spanset(repo), x).set()
1155 args = getall(repo, spanset(repo), x).set()
1156
1156
1157 def _firstsrc(rev):
1157 def _firstsrc(rev):
1158 src = _getrevsource(repo, rev)
1158 src = _getrevsource(repo, rev)
1159 if src is None:
1159 if src is None:
1160 return None
1160 return None
1161
1161
1162 while True:
1162 while True:
1163 prev = _getrevsource(repo, src)
1163 prev = _getrevsource(repo, src)
1164
1164
1165 if prev is None:
1165 if prev is None:
1166 return src
1166 return src
1167 src = prev
1167 src = prev
1168
1168
1169 o = set([_firstsrc(r) for r in args])
1169 o = set([_firstsrc(r) for r in args])
1170 o -= set([None])
1170 return subset.filter(o.__contains__)
1171 return subset.filter(o.__contains__)
1171
1172
1172 def outgoing(repo, subset, x):
1173 def outgoing(repo, subset, x):
1173 """``outgoing([path])``
1174 """``outgoing([path])``
1174 Changesets not found in the specified destination repository, or the
1175 Changesets not found in the specified destination repository, or the
1175 default push location.
1176 default push location.
1176 """
1177 """
1177 import hg # avoid start-up nasties
1178 import hg # avoid start-up nasties
1178 # i18n: "outgoing" is a keyword
1179 # i18n: "outgoing" is a keyword
1179 l = getargs(x, 0, 1, _("outgoing takes one or no arguments"))
1180 l = getargs(x, 0, 1, _("outgoing takes one or no arguments"))
1180 # i18n: "outgoing" is a keyword
1181 # i18n: "outgoing" is a keyword
1181 dest = l and getstring(l[0], _("outgoing requires a repository path")) or ''
1182 dest = l and getstring(l[0], _("outgoing requires a repository path")) or ''
1182 dest = repo.ui.expandpath(dest or 'default-push', dest or 'default')
1183 dest = repo.ui.expandpath(dest or 'default-push', dest or 'default')
1183 dest, branches = hg.parseurl(dest)
1184 dest, branches = hg.parseurl(dest)
1184 revs, checkout = hg.addbranchrevs(repo, repo, branches, [])
1185 revs, checkout = hg.addbranchrevs(repo, repo, branches, [])
1185 if revs:
1186 if revs:
1186 revs = [repo.lookup(rev) for rev in revs]
1187 revs = [repo.lookup(rev) for rev in revs]
1187 other = hg.peer(repo, {}, dest)
1188 other = hg.peer(repo, {}, dest)
1188 repo.ui.pushbuffer()
1189 repo.ui.pushbuffer()
1189 outgoing = discovery.findcommonoutgoing(repo, other, onlyheads=revs)
1190 outgoing = discovery.findcommonoutgoing(repo, other, onlyheads=revs)
1190 repo.ui.popbuffer()
1191 repo.ui.popbuffer()
1191 cl = repo.changelog
1192 cl = repo.changelog
1192 o = set([cl.rev(r) for r in outgoing.missing])
1193 o = set([cl.rev(r) for r in outgoing.missing])
1193 return subset.filter(o.__contains__)
1194 return subset.filter(o.__contains__)
1194
1195
1195 def p1(repo, subset, x):
1196 def p1(repo, subset, x):
1196 """``p1([set])``
1197 """``p1([set])``
1197 First parent of changesets in set, or the working directory.
1198 First parent of changesets in set, or the working directory.
1198 """
1199 """
1199 if x is None:
1200 if x is None:
1200 p = repo[x].p1().rev()
1201 p = repo[x].p1().rev()
1201 return subset.filter(lambda r: r == p)
1202 return subset.filter(lambda r: r == p)
1202
1203
1203 ps = set()
1204 ps = set()
1204 cl = repo.changelog
1205 cl = repo.changelog
1205 for r in getset(repo, spanset(repo), x):
1206 for r in getset(repo, spanset(repo), x):
1206 ps.add(cl.parentrevs(r)[0])
1207 ps.add(cl.parentrevs(r)[0])
1207 ps -= set([node.nullrev])
1208 ps -= set([node.nullrev])
1208 return subset & ps
1209 return subset & ps
1209
1210
1210 def p2(repo, subset, x):
1211 def p2(repo, subset, x):
1211 """``p2([set])``
1212 """``p2([set])``
1212 Second parent of changesets in set, or the working directory.
1213 Second parent of changesets in set, or the working directory.
1213 """
1214 """
1214 if x is None:
1215 if x is None:
1215 ps = repo[x].parents()
1216 ps = repo[x].parents()
1216 try:
1217 try:
1217 p = ps[1].rev()
1218 p = ps[1].rev()
1218 return subset.filter(lambda r: r == p)
1219 return subset.filter(lambda r: r == p)
1219 except IndexError:
1220 except IndexError:
1220 return baseset([])
1221 return baseset([])
1221
1222
1222 ps = set()
1223 ps = set()
1223 cl = repo.changelog
1224 cl = repo.changelog
1224 for r in getset(repo, spanset(repo), x):
1225 for r in getset(repo, spanset(repo), x):
1225 ps.add(cl.parentrevs(r)[1])
1226 ps.add(cl.parentrevs(r)[1])
1226 ps -= set([node.nullrev])
1227 ps -= set([node.nullrev])
1227 return subset & ps
1228 return subset & ps
1228
1229
1229 def parents(repo, subset, x):
1230 def parents(repo, subset, x):
1230 """``parents([set])``
1231 """``parents([set])``
1231 The set of all parents for all changesets in set, or the working directory.
1232 The set of all parents for all changesets in set, or the working directory.
1232 """
1233 """
1233 if x is None:
1234 if x is None:
1234 ps = set(p.rev() for p in repo[x].parents())
1235 ps = set(p.rev() for p in repo[x].parents())
1235 else:
1236 else:
1236 ps = set()
1237 ps = set()
1237 cl = repo.changelog
1238 cl = repo.changelog
1238 for r in getset(repo, spanset(repo), x):
1239 for r in getset(repo, spanset(repo), x):
1239 ps.update(cl.parentrevs(r))
1240 ps.update(cl.parentrevs(r))
1240 ps -= set([node.nullrev])
1241 ps -= set([node.nullrev])
1241 return baseset(ps) & subset
1242 return baseset(ps) & subset
1242
1243
1243 def parentspec(repo, subset, x, n):
1244 def parentspec(repo, subset, x, n):
1244 """``set^0``
1245 """``set^0``
1245 The set.
1246 The set.
1246 ``set^1`` (or ``set^``), ``set^2``
1247 ``set^1`` (or ``set^``), ``set^2``
1247 First or second parent, respectively, of all changesets in set.
1248 First or second parent, respectively, of all changesets in set.
1248 """
1249 """
1249 try:
1250 try:
1250 n = int(n[1])
1251 n = int(n[1])
1251 if n not in (0, 1, 2):
1252 if n not in (0, 1, 2):
1252 raise ValueError
1253 raise ValueError
1253 except (TypeError, ValueError):
1254 except (TypeError, ValueError):
1254 raise error.ParseError(_("^ expects a number 0, 1, or 2"))
1255 raise error.ParseError(_("^ expects a number 0, 1, or 2"))
1255 ps = set()
1256 ps = set()
1256 cl = repo.changelog
1257 cl = repo.changelog
1257 for r in getset(repo, baseset(cl), x):
1258 for r in getset(repo, baseset(cl), x):
1258 if n == 0:
1259 if n == 0:
1259 ps.add(r)
1260 ps.add(r)
1260 elif n == 1:
1261 elif n == 1:
1261 ps.add(cl.parentrevs(r)[0])
1262 ps.add(cl.parentrevs(r)[0])
1262 elif n == 2:
1263 elif n == 2:
1263 parents = cl.parentrevs(r)
1264 parents = cl.parentrevs(r)
1264 if len(parents) > 1:
1265 if len(parents) > 1:
1265 ps.add(parents[1])
1266 ps.add(parents[1])
1266 return subset & ps
1267 return subset & ps
1267
1268
1268 def present(repo, subset, x):
1269 def present(repo, subset, x):
1269 """``present(set)``
1270 """``present(set)``
1270 An empty set, if any revision in set isn't found; otherwise,
1271 An empty set, if any revision in set isn't found; otherwise,
1271 all revisions in set.
1272 all revisions in set.
1272
1273
1273 If any of specified revisions is not present in the local repository,
1274 If any of specified revisions is not present in the local repository,
1274 the query is normally aborted. But this predicate allows the query
1275 the query is normally aborted. But this predicate allows the query
1275 to continue even in such cases.
1276 to continue even in such cases.
1276 """
1277 """
1277 try:
1278 try:
1278 return getset(repo, subset, x)
1279 return getset(repo, subset, x)
1279 except error.RepoLookupError:
1280 except error.RepoLookupError:
1280 return baseset([])
1281 return baseset([])
1281
1282
1282 def public(repo, subset, x):
1283 def public(repo, subset, x):
1283 """``public()``
1284 """``public()``
1284 Changeset in public phase."""
1285 Changeset in public phase."""
1285 # i18n: "public" is a keyword
1286 # i18n: "public" is a keyword
1286 getargs(x, 0, 0, _("public takes no arguments"))
1287 getargs(x, 0, 0, _("public takes no arguments"))
1287 pc = repo._phasecache
1288 pc = repo._phasecache
1288 return subset.filter(lambda r: pc.phase(repo, r) == phases.public)
1289 return subset.filter(lambda r: pc.phase(repo, r) == phases.public)
1289
1290
1290 def remote(repo, subset, x):
1291 def remote(repo, subset, x):
1291 """``remote([id [,path]])``
1292 """``remote([id [,path]])``
1292 Local revision that corresponds to the given identifier in a
1293 Local revision that corresponds to the given identifier in a
1293 remote repository, if present. Here, the '.' identifier is a
1294 remote repository, if present. Here, the '.' identifier is a
1294 synonym for the current local branch.
1295 synonym for the current local branch.
1295 """
1296 """
1296
1297
1297 import hg # avoid start-up nasties
1298 import hg # avoid start-up nasties
1298 # i18n: "remote" is a keyword
1299 # i18n: "remote" is a keyword
1299 l = getargs(x, 0, 2, _("remote takes one, two or no arguments"))
1300 l = getargs(x, 0, 2, _("remote takes one, two or no arguments"))
1300
1301
1301 q = '.'
1302 q = '.'
1302 if len(l) > 0:
1303 if len(l) > 0:
1303 # i18n: "remote" is a keyword
1304 # i18n: "remote" is a keyword
1304 q = getstring(l[0], _("remote requires a string id"))
1305 q = getstring(l[0], _("remote requires a string id"))
1305 if q == '.':
1306 if q == '.':
1306 q = repo['.'].branch()
1307 q = repo['.'].branch()
1307
1308
1308 dest = ''
1309 dest = ''
1309 if len(l) > 1:
1310 if len(l) > 1:
1310 # i18n: "remote" is a keyword
1311 # i18n: "remote" is a keyword
1311 dest = getstring(l[1], _("remote requires a repository path"))
1312 dest = getstring(l[1], _("remote requires a repository path"))
1312 dest = repo.ui.expandpath(dest or 'default')
1313 dest = repo.ui.expandpath(dest or 'default')
1313 dest, branches = hg.parseurl(dest)
1314 dest, branches = hg.parseurl(dest)
1314 revs, checkout = hg.addbranchrevs(repo, repo, branches, [])
1315 revs, checkout = hg.addbranchrevs(repo, repo, branches, [])
1315 if revs:
1316 if revs:
1316 revs = [repo.lookup(rev) for rev in revs]
1317 revs = [repo.lookup(rev) for rev in revs]
1317 other = hg.peer(repo, {}, dest)
1318 other = hg.peer(repo, {}, dest)
1318 n = other.lookup(q)
1319 n = other.lookup(q)
1319 if n in repo:
1320 if n in repo:
1320 r = repo[n].rev()
1321 r = repo[n].rev()
1321 if r in subset:
1322 if r in subset:
1322 return baseset([r])
1323 return baseset([r])
1323 return baseset([])
1324 return baseset([])
1324
1325
1325 def removes(repo, subset, x):
1326 def removes(repo, subset, x):
1326 """``removes(pattern)``
1327 """``removes(pattern)``
1327 Changesets which remove files matching pattern.
1328 Changesets which remove files matching pattern.
1328
1329
1329 The pattern without explicit kind like ``glob:`` is expected to be
1330 The pattern without explicit kind like ``glob:`` is expected to be
1330 relative to the current directory and match against a file or a
1331 relative to the current directory and match against a file or a
1331 directory.
1332 directory.
1332 """
1333 """
1333 # i18n: "removes" is a keyword
1334 # i18n: "removes" is a keyword
1334 pat = getstring(x, _("removes requires a pattern"))
1335 pat = getstring(x, _("removes requires a pattern"))
1335 return checkstatus(repo, subset, pat, 2)
1336 return checkstatus(repo, subset, pat, 2)
1336
1337
1337 def rev(repo, subset, x):
1338 def rev(repo, subset, x):
1338 """``rev(number)``
1339 """``rev(number)``
1339 Revision with the given numeric identifier.
1340 Revision with the given numeric identifier.
1340 """
1341 """
1341 # i18n: "rev" is a keyword
1342 # i18n: "rev" is a keyword
1342 l = getargs(x, 1, 1, _("rev requires one argument"))
1343 l = getargs(x, 1, 1, _("rev requires one argument"))
1343 try:
1344 try:
1344 # i18n: "rev" is a keyword
1345 # i18n: "rev" is a keyword
1345 l = int(getstring(l[0], _("rev requires a number")))
1346 l = int(getstring(l[0], _("rev requires a number")))
1346 except (TypeError, ValueError):
1347 except (TypeError, ValueError):
1347 # i18n: "rev" is a keyword
1348 # i18n: "rev" is a keyword
1348 raise error.ParseError(_("rev expects a number"))
1349 raise error.ParseError(_("rev expects a number"))
1349 return subset.filter(lambda r: r == l)
1350 return subset.filter(lambda r: r == l)
1350
1351
1351 def matching(repo, subset, x):
1352 def matching(repo, subset, x):
1352 """``matching(revision [, field])``
1353 """``matching(revision [, field])``
1353 Changesets in which a given set of fields match the set of fields in the
1354 Changesets in which a given set of fields match the set of fields in the
1354 selected revision or set.
1355 selected revision or set.
1355
1356
1356 To match more than one field pass the list of fields to match separated
1357 To match more than one field pass the list of fields to match separated
1357 by spaces (e.g. ``author description``).
1358 by spaces (e.g. ``author description``).
1358
1359
1359 Valid fields are most regular revision fields and some special fields.
1360 Valid fields are most regular revision fields and some special fields.
1360
1361
1361 Regular revision fields are ``description``, ``author``, ``branch``,
1362 Regular revision fields are ``description``, ``author``, ``branch``,
1362 ``date``, ``files``, ``phase``, ``parents``, ``substate``, ``user``
1363 ``date``, ``files``, ``phase``, ``parents``, ``substate``, ``user``
1363 and ``diff``.
1364 and ``diff``.
1364 Note that ``author`` and ``user`` are synonyms. ``diff`` refers to the
1365 Note that ``author`` and ``user`` are synonyms. ``diff`` refers to the
1365 contents of the revision. Two revisions matching their ``diff`` will
1366 contents of the revision. Two revisions matching their ``diff`` will
1366 also match their ``files``.
1367 also match their ``files``.
1367
1368
1368 Special fields are ``summary`` and ``metadata``:
1369 Special fields are ``summary`` and ``metadata``:
1369 ``summary`` matches the first line of the description.
1370 ``summary`` matches the first line of the description.
1370 ``metadata`` is equivalent to matching ``description user date``
1371 ``metadata`` is equivalent to matching ``description user date``
1371 (i.e. it matches the main metadata fields).
1372 (i.e. it matches the main metadata fields).
1372
1373
1373 ``metadata`` is the default field which is used when no fields are
1374 ``metadata`` is the default field which is used when no fields are
1374 specified. You can match more than one field at a time.
1375 specified. You can match more than one field at a time.
1375 """
1376 """
1376 # i18n: "matching" is a keyword
1377 # i18n: "matching" is a keyword
1377 l = getargs(x, 1, 2, _("matching takes 1 or 2 arguments"))
1378 l = getargs(x, 1, 2, _("matching takes 1 or 2 arguments"))
1378
1379
1379 revs = getset(repo, baseset(repo.changelog), l[0])
1380 revs = getset(repo, baseset(repo.changelog), l[0])
1380
1381
1381 fieldlist = ['metadata']
1382 fieldlist = ['metadata']
1382 if len(l) > 1:
1383 if len(l) > 1:
1383 fieldlist = getstring(l[1],
1384 fieldlist = getstring(l[1],
1384 # i18n: "matching" is a keyword
1385 # i18n: "matching" is a keyword
1385 _("matching requires a string "
1386 _("matching requires a string "
1386 "as its second argument")).split()
1387 "as its second argument")).split()
1387
1388
1388 # Make sure that there are no repeated fields,
1389 # Make sure that there are no repeated fields,
1389 # expand the 'special' 'metadata' field type
1390 # expand the 'special' 'metadata' field type
1390 # and check the 'files' whenever we check the 'diff'
1391 # and check the 'files' whenever we check the 'diff'
1391 fields = []
1392 fields = []
1392 for field in fieldlist:
1393 for field in fieldlist:
1393 if field == 'metadata':
1394 if field == 'metadata':
1394 fields += ['user', 'description', 'date']
1395 fields += ['user', 'description', 'date']
1395 elif field == 'diff':
1396 elif field == 'diff':
1396 # a revision matching the diff must also match the files
1397 # a revision matching the diff must also match the files
1397 # since matching the diff is very costly, make sure to
1398 # since matching the diff is very costly, make sure to
1398 # also match the files first
1399 # also match the files first
1399 fields += ['files', 'diff']
1400 fields += ['files', 'diff']
1400 else:
1401 else:
1401 if field == 'author':
1402 if field == 'author':
1402 field = 'user'
1403 field = 'user'
1403 fields.append(field)
1404 fields.append(field)
1404 fields = set(fields)
1405 fields = set(fields)
1405 if 'summary' in fields and 'description' in fields:
1406 if 'summary' in fields and 'description' in fields:
1406 # If a revision matches its description it also matches its summary
1407 # If a revision matches its description it also matches its summary
1407 fields.discard('summary')
1408 fields.discard('summary')
1408
1409
1409 # We may want to match more than one field
1410 # We may want to match more than one field
1410 # Not all fields take the same amount of time to be matched
1411 # Not all fields take the same amount of time to be matched
1411 # Sort the selected fields in order of increasing matching cost
1412 # Sort the selected fields in order of increasing matching cost
1412 fieldorder = ['phase', 'parents', 'user', 'date', 'branch', 'summary',
1413 fieldorder = ['phase', 'parents', 'user', 'date', 'branch', 'summary',
1413 'files', 'description', 'substate', 'diff']
1414 'files', 'description', 'substate', 'diff']
1414 def fieldkeyfunc(f):
1415 def fieldkeyfunc(f):
1415 try:
1416 try:
1416 return fieldorder.index(f)
1417 return fieldorder.index(f)
1417 except ValueError:
1418 except ValueError:
1418 # assume an unknown field is very costly
1419 # assume an unknown field is very costly
1419 return len(fieldorder)
1420 return len(fieldorder)
1420 fields = list(fields)
1421 fields = list(fields)
1421 fields.sort(key=fieldkeyfunc)
1422 fields.sort(key=fieldkeyfunc)
1422
1423
1423 # Each field will be matched with its own "getfield" function
1424 # Each field will be matched with its own "getfield" function
1424 # which will be added to the getfieldfuncs array of functions
1425 # which will be added to the getfieldfuncs array of functions
1425 getfieldfuncs = []
1426 getfieldfuncs = []
1426 _funcs = {
1427 _funcs = {
1427 'user': lambda r: repo[r].user(),
1428 'user': lambda r: repo[r].user(),
1428 'branch': lambda r: repo[r].branch(),
1429 'branch': lambda r: repo[r].branch(),
1429 'date': lambda r: repo[r].date(),
1430 'date': lambda r: repo[r].date(),
1430 'description': lambda r: repo[r].description(),
1431 'description': lambda r: repo[r].description(),
1431 'files': lambda r: repo[r].files(),
1432 'files': lambda r: repo[r].files(),
1432 'parents': lambda r: repo[r].parents(),
1433 'parents': lambda r: repo[r].parents(),
1433 'phase': lambda r: repo[r].phase(),
1434 'phase': lambda r: repo[r].phase(),
1434 'substate': lambda r: repo[r].substate,
1435 'substate': lambda r: repo[r].substate,
1435 'summary': lambda r: repo[r].description().splitlines()[0],
1436 'summary': lambda r: repo[r].description().splitlines()[0],
1436 'diff': lambda r: list(repo[r].diff(git=True),)
1437 'diff': lambda r: list(repo[r].diff(git=True),)
1437 }
1438 }
1438 for info in fields:
1439 for info in fields:
1439 getfield = _funcs.get(info, None)
1440 getfield = _funcs.get(info, None)
1440 if getfield is None:
1441 if getfield is None:
1441 raise error.ParseError(
1442 raise error.ParseError(
1442 # i18n: "matching" is a keyword
1443 # i18n: "matching" is a keyword
1443 _("unexpected field name passed to matching: %s") % info)
1444 _("unexpected field name passed to matching: %s") % info)
1444 getfieldfuncs.append(getfield)
1445 getfieldfuncs.append(getfield)
1445 # convert the getfield array of functions into a "getinfo" function
1446 # convert the getfield array of functions into a "getinfo" function
1446 # which returns an array of field values (or a single value if there
1447 # which returns an array of field values (or a single value if there
1447 # is only one field to match)
1448 # is only one field to match)
1448 getinfo = lambda r: [f(r) for f in getfieldfuncs]
1449 getinfo = lambda r: [f(r) for f in getfieldfuncs]
1449
1450
1450 def matches(x):
1451 def matches(x):
1451 for rev in revs:
1452 for rev in revs:
1452 target = getinfo(rev)
1453 target = getinfo(rev)
1453 match = True
1454 match = True
1454 for n, f in enumerate(getfieldfuncs):
1455 for n, f in enumerate(getfieldfuncs):
1455 if target[n] != f(x):
1456 if target[n] != f(x):
1456 match = False
1457 match = False
1457 if match:
1458 if match:
1458 return True
1459 return True
1459 return False
1460 return False
1460
1461
1461 return subset.filter(matches)
1462 return subset.filter(matches)
1462
1463
1463 def reverse(repo, subset, x):
1464 def reverse(repo, subset, x):
1464 """``reverse(set)``
1465 """``reverse(set)``
1465 Reverse order of set.
1466 Reverse order of set.
1466 """
1467 """
1467 l = getset(repo, subset, x)
1468 l = getset(repo, subset, x)
1468 l.reverse()
1469 l.reverse()
1469 return l
1470 return l
1470
1471
1471 def roots(repo, subset, x):
1472 def roots(repo, subset, x):
1472 """``roots(set)``
1473 """``roots(set)``
1473 Changesets in set with no parent changeset in set.
1474 Changesets in set with no parent changeset in set.
1474 """
1475 """
1475 s = getset(repo, spanset(repo), x).set()
1476 s = getset(repo, spanset(repo), x).set()
1476 subset = baseset([r for r in s if r in subset.set()])
1477 subset = baseset([r for r in s if r in subset.set()])
1477 cs = _children(repo, subset, s)
1478 cs = _children(repo, subset, s)
1478 return subset - cs
1479 return subset - cs
1479
1480
1480 def secret(repo, subset, x):
1481 def secret(repo, subset, x):
1481 """``secret()``
1482 """``secret()``
1482 Changeset in secret phase."""
1483 Changeset in secret phase."""
1483 # i18n: "secret" is a keyword
1484 # i18n: "secret" is a keyword
1484 getargs(x, 0, 0, _("secret takes no arguments"))
1485 getargs(x, 0, 0, _("secret takes no arguments"))
1485 pc = repo._phasecache
1486 pc = repo._phasecache
1486 return subset.filter(lambda x: pc.phase(repo, x) == phases.secret)
1487 return subset.filter(lambda x: pc.phase(repo, x) == phases.secret)
1487
1488
1488 def sort(repo, subset, x):
1489 def sort(repo, subset, x):
1489 """``sort(set[, [-]key...])``
1490 """``sort(set[, [-]key...])``
1490 Sort set by keys. The default sort order is ascending, specify a key
1491 Sort set by keys. The default sort order is ascending, specify a key
1491 as ``-key`` to sort in descending order.
1492 as ``-key`` to sort in descending order.
1492
1493
1493 The keys can be:
1494 The keys can be:
1494
1495
1495 - ``rev`` for the revision number,
1496 - ``rev`` for the revision number,
1496 - ``branch`` for the branch name,
1497 - ``branch`` for the branch name,
1497 - ``desc`` for the commit message (description),
1498 - ``desc`` for the commit message (description),
1498 - ``user`` for user name (``author`` can be used as an alias),
1499 - ``user`` for user name (``author`` can be used as an alias),
1499 - ``date`` for the commit date
1500 - ``date`` for the commit date
1500 """
1501 """
1501 # i18n: "sort" is a keyword
1502 # i18n: "sort" is a keyword
1502 l = getargs(x, 1, 2, _("sort requires one or two arguments"))
1503 l = getargs(x, 1, 2, _("sort requires one or two arguments"))
1503 keys = "rev"
1504 keys = "rev"
1504 if len(l) == 2:
1505 if len(l) == 2:
1505 # i18n: "sort" is a keyword
1506 # i18n: "sort" is a keyword
1506 keys = getstring(l[1], _("sort spec must be a string"))
1507 keys = getstring(l[1], _("sort spec must be a string"))
1507
1508
1508 s = l[0]
1509 s = l[0]
1509 keys = keys.split()
1510 keys = keys.split()
1510 l = []
1511 l = []
1511 def invert(s):
1512 def invert(s):
1512 return "".join(chr(255 - ord(c)) for c in s)
1513 return "".join(chr(255 - ord(c)) for c in s)
1513 revs = getset(repo, subset, s)
1514 revs = getset(repo, subset, s)
1514 if keys == ["rev"]:
1515 if keys == ["rev"]:
1515 revs.sort()
1516 revs.sort()
1516 return revs
1517 return revs
1517 elif keys == ["-rev"]:
1518 elif keys == ["-rev"]:
1518 revs.sort(reverse=True)
1519 revs.sort(reverse=True)
1519 return revs
1520 return revs
1520 for r in revs:
1521 for r in revs:
1521 c = repo[r]
1522 c = repo[r]
1522 e = []
1523 e = []
1523 for k in keys:
1524 for k in keys:
1524 if k == 'rev':
1525 if k == 'rev':
1525 e.append(r)
1526 e.append(r)
1526 elif k == '-rev':
1527 elif k == '-rev':
1527 e.append(-r)
1528 e.append(-r)
1528 elif k == 'branch':
1529 elif k == 'branch':
1529 e.append(c.branch())
1530 e.append(c.branch())
1530 elif k == '-branch':
1531 elif k == '-branch':
1531 e.append(invert(c.branch()))
1532 e.append(invert(c.branch()))
1532 elif k == 'desc':
1533 elif k == 'desc':
1533 e.append(c.description())
1534 e.append(c.description())
1534 elif k == '-desc':
1535 elif k == '-desc':
1535 e.append(invert(c.description()))
1536 e.append(invert(c.description()))
1536 elif k in 'user author':
1537 elif k in 'user author':
1537 e.append(c.user())
1538 e.append(c.user())
1538 elif k in '-user -author':
1539 elif k in '-user -author':
1539 e.append(invert(c.user()))
1540 e.append(invert(c.user()))
1540 elif k == 'date':
1541 elif k == 'date':
1541 e.append(c.date()[0])
1542 e.append(c.date()[0])
1542 elif k == '-date':
1543 elif k == '-date':
1543 e.append(-c.date()[0])
1544 e.append(-c.date()[0])
1544 else:
1545 else:
1545 raise error.ParseError(_("unknown sort key %r") % k)
1546 raise error.ParseError(_("unknown sort key %r") % k)
1546 e.append(r)
1547 e.append(r)
1547 l.append(e)
1548 l.append(e)
1548 l.sort()
1549 l.sort()
1549 return baseset([e[-1] for e in l])
1550 return baseset([e[-1] for e in l])
1550
1551
1551 def _stringmatcher(pattern):
1552 def _stringmatcher(pattern):
1552 """
1553 """
1553 accepts a string, possibly starting with 're:' or 'literal:' prefix.
1554 accepts a string, possibly starting with 're:' or 'literal:' prefix.
1554 returns the matcher name, pattern, and matcher function.
1555 returns the matcher name, pattern, and matcher function.
1555 missing or unknown prefixes are treated as literal matches.
1556 missing or unknown prefixes are treated as literal matches.
1556
1557
1557 helper for tests:
1558 helper for tests:
1558 >>> def test(pattern, *tests):
1559 >>> def test(pattern, *tests):
1559 ... kind, pattern, matcher = _stringmatcher(pattern)
1560 ... kind, pattern, matcher = _stringmatcher(pattern)
1560 ... return (kind, pattern, [bool(matcher(t)) for t in tests])
1561 ... return (kind, pattern, [bool(matcher(t)) for t in tests])
1561
1562
1562 exact matching (no prefix):
1563 exact matching (no prefix):
1563 >>> test('abcdefg', 'abc', 'def', 'abcdefg')
1564 >>> test('abcdefg', 'abc', 'def', 'abcdefg')
1564 ('literal', 'abcdefg', [False, False, True])
1565 ('literal', 'abcdefg', [False, False, True])
1565
1566
1566 regex matching ('re:' prefix)
1567 regex matching ('re:' prefix)
1567 >>> test('re:a.+b', 'nomatch', 'fooadef', 'fooadefbar')
1568 >>> test('re:a.+b', 'nomatch', 'fooadef', 'fooadefbar')
1568 ('re', 'a.+b', [False, False, True])
1569 ('re', 'a.+b', [False, False, True])
1569
1570
1570 force exact matches ('literal:' prefix)
1571 force exact matches ('literal:' prefix)
1571 >>> test('literal:re:foobar', 'foobar', 're:foobar')
1572 >>> test('literal:re:foobar', 'foobar', 're:foobar')
1572 ('literal', 're:foobar', [False, True])
1573 ('literal', 're:foobar', [False, True])
1573
1574
1574 unknown prefixes are ignored and treated as literals
1575 unknown prefixes are ignored and treated as literals
1575 >>> test('foo:bar', 'foo', 'bar', 'foo:bar')
1576 >>> test('foo:bar', 'foo', 'bar', 'foo:bar')
1576 ('literal', 'foo:bar', [False, False, True])
1577 ('literal', 'foo:bar', [False, False, True])
1577 """
1578 """
1578 if pattern.startswith('re:'):
1579 if pattern.startswith('re:'):
1579 pattern = pattern[3:]
1580 pattern = pattern[3:]
1580 try:
1581 try:
1581 regex = re.compile(pattern)
1582 regex = re.compile(pattern)
1582 except re.error, e:
1583 except re.error, e:
1583 raise error.ParseError(_('invalid regular expression: %s')
1584 raise error.ParseError(_('invalid regular expression: %s')
1584 % e)
1585 % e)
1585 return 're', pattern, regex.search
1586 return 're', pattern, regex.search
1586 elif pattern.startswith('literal:'):
1587 elif pattern.startswith('literal:'):
1587 pattern = pattern[8:]
1588 pattern = pattern[8:]
1588 return 'literal', pattern, pattern.__eq__
1589 return 'literal', pattern, pattern.__eq__
1589
1590
1590 def _substringmatcher(pattern):
1591 def _substringmatcher(pattern):
1591 kind, pattern, matcher = _stringmatcher(pattern)
1592 kind, pattern, matcher = _stringmatcher(pattern)
1592 if kind == 'literal':
1593 if kind == 'literal':
1593 matcher = lambda s: pattern in s
1594 matcher = lambda s: pattern in s
1594 return kind, pattern, matcher
1595 return kind, pattern, matcher
1595
1596
1596 def tag(repo, subset, x):
1597 def tag(repo, subset, x):
1597 """``tag([name])``
1598 """``tag([name])``
1598 The specified tag by name, or all tagged revisions if no name is given.
1599 The specified tag by name, or all tagged revisions if no name is given.
1599
1600
1600 If `name` starts with `re:`, the remainder of the name is treated as
1601 If `name` starts with `re:`, the remainder of the name is treated as
1601 a regular expression. To match a tag that actually starts with `re:`,
1602 a regular expression. To match a tag that actually starts with `re:`,
1602 use the prefix `literal:`.
1603 use the prefix `literal:`.
1603 """
1604 """
1604 # i18n: "tag" is a keyword
1605 # i18n: "tag" is a keyword
1605 args = getargs(x, 0, 1, _("tag takes one or no arguments"))
1606 args = getargs(x, 0, 1, _("tag takes one or no arguments"))
1606 cl = repo.changelog
1607 cl = repo.changelog
1607 if args:
1608 if args:
1608 pattern = getstring(args[0],
1609 pattern = getstring(args[0],
1609 # i18n: "tag" is a keyword
1610 # i18n: "tag" is a keyword
1610 _('the argument to tag must be a string'))
1611 _('the argument to tag must be a string'))
1611 kind, pattern, matcher = _stringmatcher(pattern)
1612 kind, pattern, matcher = _stringmatcher(pattern)
1612 if kind == 'literal':
1613 if kind == 'literal':
1613 # avoid resolving all tags
1614 # avoid resolving all tags
1614 tn = repo._tagscache.tags.get(pattern, None)
1615 tn = repo._tagscache.tags.get(pattern, None)
1615 if tn is None:
1616 if tn is None:
1616 raise util.Abort(_("tag '%s' does not exist") % pattern)
1617 raise util.Abort(_("tag '%s' does not exist") % pattern)
1617 s = set([repo[tn].rev()])
1618 s = set([repo[tn].rev()])
1618 else:
1619 else:
1619 s = set([cl.rev(n) for t, n in repo.tagslist() if matcher(t)])
1620 s = set([cl.rev(n) for t, n in repo.tagslist() if matcher(t)])
1620 else:
1621 else:
1621 s = set([cl.rev(n) for t, n in repo.tagslist() if t != 'tip'])
1622 s = set([cl.rev(n) for t, n in repo.tagslist() if t != 'tip'])
1622 return subset & s
1623 return subset & s
1623
1624
1624 def tagged(repo, subset, x):
1625 def tagged(repo, subset, x):
1625 return tag(repo, subset, x)
1626 return tag(repo, subset, x)
1626
1627
1627 def unstable(repo, subset, x):
1628 def unstable(repo, subset, x):
1628 """``unstable()``
1629 """``unstable()``
1629 Non-obsolete changesets with obsolete ancestors.
1630 Non-obsolete changesets with obsolete ancestors.
1630 """
1631 """
1631 # i18n: "unstable" is a keyword
1632 # i18n: "unstable" is a keyword
1632 getargs(x, 0, 0, _("unstable takes no arguments"))
1633 getargs(x, 0, 0, _("unstable takes no arguments"))
1633 unstables = obsmod.getrevs(repo, 'unstable')
1634 unstables = obsmod.getrevs(repo, 'unstable')
1634 return subset & unstables
1635 return subset & unstables
1635
1636
1636
1637
1637 def user(repo, subset, x):
1638 def user(repo, subset, x):
1638 """``user(string)``
1639 """``user(string)``
1639 User name contains string. The match is case-insensitive.
1640 User name contains string. The match is case-insensitive.
1640
1641
1641 If `string` starts with `re:`, the remainder of the string is treated as
1642 If `string` starts with `re:`, the remainder of the string is treated as
1642 a regular expression. To match a user that actually contains `re:`, use
1643 a regular expression. To match a user that actually contains `re:`, use
1643 the prefix `literal:`.
1644 the prefix `literal:`.
1644 """
1645 """
1645 return author(repo, subset, x)
1646 return author(repo, subset, x)
1646
1647
1647 # for internal use
1648 # for internal use
1648 def _list(repo, subset, x):
1649 def _list(repo, subset, x):
1649 s = getstring(x, "internal error")
1650 s = getstring(x, "internal error")
1650 if not s:
1651 if not s:
1651 return baseset([])
1652 return baseset([])
1652 ls = [repo[r].rev() for r in s.split('\0')]
1653 ls = [repo[r].rev() for r in s.split('\0')]
1653 s = subset.set()
1654 s = subset.set()
1654 return baseset([r for r in ls if r in s])
1655 return baseset([r for r in ls if r in s])
1655
1656
1656 # for internal use
1657 # for internal use
1657 def _intlist(repo, subset, x):
1658 def _intlist(repo, subset, x):
1658 s = getstring(x, "internal error")
1659 s = getstring(x, "internal error")
1659 if not s:
1660 if not s:
1660 return baseset([])
1661 return baseset([])
1661 ls = [int(r) for r in s.split('\0')]
1662 ls = [int(r) for r in s.split('\0')]
1662 s = subset.set()
1663 s = subset.set()
1663 return baseset([r for r in ls if r in s])
1664 return baseset([r for r in ls if r in s])
1664
1665
1665 # for internal use
1666 # for internal use
1666 def _hexlist(repo, subset, x):
1667 def _hexlist(repo, subset, x):
1667 s = getstring(x, "internal error")
1668 s = getstring(x, "internal error")
1668 if not s:
1669 if not s:
1669 return baseset([])
1670 return baseset([])
1670 cl = repo.changelog
1671 cl = repo.changelog
1671 ls = [cl.rev(node.bin(r)) for r in s.split('\0')]
1672 ls = [cl.rev(node.bin(r)) for r in s.split('\0')]
1672 s = subset.set()
1673 s = subset.set()
1673 return baseset([r for r in ls if r in s])
1674 return baseset([r for r in ls if r in s])
1674
1675
1675 symbols = {
1676 symbols = {
1676 "adds": adds,
1677 "adds": adds,
1677 "all": getall,
1678 "all": getall,
1678 "ancestor": ancestor,
1679 "ancestor": ancestor,
1679 "ancestors": ancestors,
1680 "ancestors": ancestors,
1680 "_firstancestors": _firstancestors,
1681 "_firstancestors": _firstancestors,
1681 "author": author,
1682 "author": author,
1682 "only": only,
1683 "only": only,
1683 "bisect": bisect,
1684 "bisect": bisect,
1684 "bisected": bisected,
1685 "bisected": bisected,
1685 "bookmark": bookmark,
1686 "bookmark": bookmark,
1686 "branch": branch,
1687 "branch": branch,
1687 "branchpoint": branchpoint,
1688 "branchpoint": branchpoint,
1688 "bumped": bumped,
1689 "bumped": bumped,
1689 "bundle": bundle,
1690 "bundle": bundle,
1690 "children": children,
1691 "children": children,
1691 "closed": closed,
1692 "closed": closed,
1692 "contains": contains,
1693 "contains": contains,
1693 "converted": converted,
1694 "converted": converted,
1694 "date": date,
1695 "date": date,
1695 "desc": desc,
1696 "desc": desc,
1696 "descendants": descendants,
1697 "descendants": descendants,
1697 "_firstdescendants": _firstdescendants,
1698 "_firstdescendants": _firstdescendants,
1698 "destination": destination,
1699 "destination": destination,
1699 "divergent": divergent,
1700 "divergent": divergent,
1700 "draft": draft,
1701 "draft": draft,
1701 "extinct": extinct,
1702 "extinct": extinct,
1702 "extra": extra,
1703 "extra": extra,
1703 "file": hasfile,
1704 "file": hasfile,
1704 "filelog": filelog,
1705 "filelog": filelog,
1705 "first": first,
1706 "first": first,
1706 "follow": follow,
1707 "follow": follow,
1707 "_followfirst": _followfirst,
1708 "_followfirst": _followfirst,
1708 "grep": grep,
1709 "grep": grep,
1709 "head": head,
1710 "head": head,
1710 "heads": heads,
1711 "heads": heads,
1711 "hidden": hidden,
1712 "hidden": hidden,
1712 "id": node_,
1713 "id": node_,
1713 "keyword": keyword,
1714 "keyword": keyword,
1714 "last": last,
1715 "last": last,
1715 "limit": limit,
1716 "limit": limit,
1716 "_matchfiles": _matchfiles,
1717 "_matchfiles": _matchfiles,
1717 "max": maxrev,
1718 "max": maxrev,
1718 "merge": merge,
1719 "merge": merge,
1719 "min": minrev,
1720 "min": minrev,
1720 "modifies": modifies,
1721 "modifies": modifies,
1721 "obsolete": obsolete,
1722 "obsolete": obsolete,
1722 "origin": origin,
1723 "origin": origin,
1723 "outgoing": outgoing,
1724 "outgoing": outgoing,
1724 "p1": p1,
1725 "p1": p1,
1725 "p2": p2,
1726 "p2": p2,
1726 "parents": parents,
1727 "parents": parents,
1727 "present": present,
1728 "present": present,
1728 "public": public,
1729 "public": public,
1729 "remote": remote,
1730 "remote": remote,
1730 "removes": removes,
1731 "removes": removes,
1731 "rev": rev,
1732 "rev": rev,
1732 "reverse": reverse,
1733 "reverse": reverse,
1733 "roots": roots,
1734 "roots": roots,
1734 "sort": sort,
1735 "sort": sort,
1735 "secret": secret,
1736 "secret": secret,
1736 "matching": matching,
1737 "matching": matching,
1737 "tag": tag,
1738 "tag": tag,
1738 "tagged": tagged,
1739 "tagged": tagged,
1739 "user": user,
1740 "user": user,
1740 "unstable": unstable,
1741 "unstable": unstable,
1741 "_list": _list,
1742 "_list": _list,
1742 "_intlist": _intlist,
1743 "_intlist": _intlist,
1743 "_hexlist": _hexlist,
1744 "_hexlist": _hexlist,
1744 }
1745 }
1745
1746
1746 # symbols which can't be used for a DoS attack for any given input
1747 # symbols which can't be used for a DoS attack for any given input
1747 # (e.g. those which accept regexes as plain strings shouldn't be included)
1748 # (e.g. those which accept regexes as plain strings shouldn't be included)
1748 # functions that just return a lot of changesets (like all) don't count here
1749 # functions that just return a lot of changesets (like all) don't count here
1749 safesymbols = set([
1750 safesymbols = set([
1750 "adds",
1751 "adds",
1751 "all",
1752 "all",
1752 "ancestor",
1753 "ancestor",
1753 "ancestors",
1754 "ancestors",
1754 "_firstancestors",
1755 "_firstancestors",
1755 "author",
1756 "author",
1756 "bisect",
1757 "bisect",
1757 "bisected",
1758 "bisected",
1758 "bookmark",
1759 "bookmark",
1759 "branch",
1760 "branch",
1760 "branchpoint",
1761 "branchpoint",
1761 "bumped",
1762 "bumped",
1762 "bundle",
1763 "bundle",
1763 "children",
1764 "children",
1764 "closed",
1765 "closed",
1765 "converted",
1766 "converted",
1766 "date",
1767 "date",
1767 "desc",
1768 "desc",
1768 "descendants",
1769 "descendants",
1769 "_firstdescendants",
1770 "_firstdescendants",
1770 "destination",
1771 "destination",
1771 "divergent",
1772 "divergent",
1772 "draft",
1773 "draft",
1773 "extinct",
1774 "extinct",
1774 "extra",
1775 "extra",
1775 "file",
1776 "file",
1776 "filelog",
1777 "filelog",
1777 "first",
1778 "first",
1778 "follow",
1779 "follow",
1779 "_followfirst",
1780 "_followfirst",
1780 "head",
1781 "head",
1781 "heads",
1782 "heads",
1782 "hidden",
1783 "hidden",
1783 "id",
1784 "id",
1784 "keyword",
1785 "keyword",
1785 "last",
1786 "last",
1786 "limit",
1787 "limit",
1787 "_matchfiles",
1788 "_matchfiles",
1788 "max",
1789 "max",
1789 "merge",
1790 "merge",
1790 "min",
1791 "min",
1791 "modifies",
1792 "modifies",
1792 "obsolete",
1793 "obsolete",
1793 "origin",
1794 "origin",
1794 "outgoing",
1795 "outgoing",
1795 "p1",
1796 "p1",
1796 "p2",
1797 "p2",
1797 "parents",
1798 "parents",
1798 "present",
1799 "present",
1799 "public",
1800 "public",
1800 "remote",
1801 "remote",
1801 "removes",
1802 "removes",
1802 "rev",
1803 "rev",
1803 "reverse",
1804 "reverse",
1804 "roots",
1805 "roots",
1805 "sort",
1806 "sort",
1806 "secret",
1807 "secret",
1807 "matching",
1808 "matching",
1808 "tag",
1809 "tag",
1809 "tagged",
1810 "tagged",
1810 "user",
1811 "user",
1811 "unstable",
1812 "unstable",
1812 "_list",
1813 "_list",
1813 "_intlist",
1814 "_intlist",
1814 "_hexlist",
1815 "_hexlist",
1815 ])
1816 ])
1816
1817
1817 methods = {
1818 methods = {
1818 "range": rangeset,
1819 "range": rangeset,
1819 "dagrange": dagrange,
1820 "dagrange": dagrange,
1820 "string": stringset,
1821 "string": stringset,
1821 "symbol": symbolset,
1822 "symbol": symbolset,
1822 "and": andset,
1823 "and": andset,
1823 "or": orset,
1824 "or": orset,
1824 "not": notset,
1825 "not": notset,
1825 "list": listset,
1826 "list": listset,
1826 "func": func,
1827 "func": func,
1827 "ancestor": ancestorspec,
1828 "ancestor": ancestorspec,
1828 "parent": parentspec,
1829 "parent": parentspec,
1829 "parentpost": p1,
1830 "parentpost": p1,
1830 }
1831 }
1831
1832
1832 def optimize(x, small):
1833 def optimize(x, small):
1833 if x is None:
1834 if x is None:
1834 return 0, x
1835 return 0, x
1835
1836
1836 smallbonus = 1
1837 smallbonus = 1
1837 if small:
1838 if small:
1838 smallbonus = .5
1839 smallbonus = .5
1839
1840
1840 op = x[0]
1841 op = x[0]
1841 if op == 'minus':
1842 if op == 'minus':
1842 return optimize(('and', x[1], ('not', x[2])), small)
1843 return optimize(('and', x[1], ('not', x[2])), small)
1843 elif op == 'dagrangepre':
1844 elif op == 'dagrangepre':
1844 return optimize(('func', ('symbol', 'ancestors'), x[1]), small)
1845 return optimize(('func', ('symbol', 'ancestors'), x[1]), small)
1845 elif op == 'dagrangepost':
1846 elif op == 'dagrangepost':
1846 return optimize(('func', ('symbol', 'descendants'), x[1]), small)
1847 return optimize(('func', ('symbol', 'descendants'), x[1]), small)
1847 elif op == 'rangepre':
1848 elif op == 'rangepre':
1848 return optimize(('range', ('string', '0'), x[1]), small)
1849 return optimize(('range', ('string', '0'), x[1]), small)
1849 elif op == 'rangepost':
1850 elif op == 'rangepost':
1850 return optimize(('range', x[1], ('string', 'tip')), small)
1851 return optimize(('range', x[1], ('string', 'tip')), small)
1851 elif op == 'negate':
1852 elif op == 'negate':
1852 return optimize(('string',
1853 return optimize(('string',
1853 '-' + getstring(x[1], _("can't negate that"))), small)
1854 '-' + getstring(x[1], _("can't negate that"))), small)
1854 elif op in 'string symbol negate':
1855 elif op in 'string symbol negate':
1855 return smallbonus, x # single revisions are small
1856 return smallbonus, x # single revisions are small
1856 elif op == 'and':
1857 elif op == 'and':
1857 wa, ta = optimize(x[1], True)
1858 wa, ta = optimize(x[1], True)
1858 wb, tb = optimize(x[2], True)
1859 wb, tb = optimize(x[2], True)
1859
1860
1860 # (::x and not ::y)/(not ::y and ::x) have a fast path
1861 # (::x and not ::y)/(not ::y and ::x) have a fast path
1861 def isonly(revs, bases):
1862 def isonly(revs, bases):
1862 return (
1863 return (
1863 revs[0] == 'func'
1864 revs[0] == 'func'
1864 and getstring(revs[1], _('not a symbol')) == 'ancestors'
1865 and getstring(revs[1], _('not a symbol')) == 'ancestors'
1865 and bases[0] == 'not'
1866 and bases[0] == 'not'
1866 and bases[1][0] == 'func'
1867 and bases[1][0] == 'func'
1867 and getstring(bases[1][1], _('not a symbol')) == 'ancestors')
1868 and getstring(bases[1][1], _('not a symbol')) == 'ancestors')
1868
1869
1869 w = min(wa, wb)
1870 w = min(wa, wb)
1870 if isonly(ta, tb):
1871 if isonly(ta, tb):
1871 return w, ('func', ('symbol', 'only'), ('list', ta[2], tb[1][2]))
1872 return w, ('func', ('symbol', 'only'), ('list', ta[2], tb[1][2]))
1872 if isonly(tb, ta):
1873 if isonly(tb, ta):
1873 return w, ('func', ('symbol', 'only'), ('list', tb[2], ta[1][2]))
1874 return w, ('func', ('symbol', 'only'), ('list', tb[2], ta[1][2]))
1874
1875
1875 if wa > wb:
1876 if wa > wb:
1876 return w, (op, tb, ta)
1877 return w, (op, tb, ta)
1877 return w, (op, ta, tb)
1878 return w, (op, ta, tb)
1878 elif op == 'or':
1879 elif op == 'or':
1879 wa, ta = optimize(x[1], False)
1880 wa, ta = optimize(x[1], False)
1880 wb, tb = optimize(x[2], False)
1881 wb, tb = optimize(x[2], False)
1881 if wb < wa:
1882 if wb < wa:
1882 wb, wa = wa, wb
1883 wb, wa = wa, wb
1883 return max(wa, wb), (op, ta, tb)
1884 return max(wa, wb), (op, ta, tb)
1884 elif op == 'not':
1885 elif op == 'not':
1885 o = optimize(x[1], not small)
1886 o = optimize(x[1], not small)
1886 return o[0], (op, o[1])
1887 return o[0], (op, o[1])
1887 elif op == 'parentpost':
1888 elif op == 'parentpost':
1888 o = optimize(x[1], small)
1889 o = optimize(x[1], small)
1889 return o[0], (op, o[1])
1890 return o[0], (op, o[1])
1890 elif op == 'group':
1891 elif op == 'group':
1891 return optimize(x[1], small)
1892 return optimize(x[1], small)
1892 elif op in 'dagrange range list parent ancestorspec':
1893 elif op in 'dagrange range list parent ancestorspec':
1893 if op == 'parent':
1894 if op == 'parent':
1894 # x^:y means (x^) : y, not x ^ (:y)
1895 # x^:y means (x^) : y, not x ^ (:y)
1895 post = ('parentpost', x[1])
1896 post = ('parentpost', x[1])
1896 if x[2][0] == 'dagrangepre':
1897 if x[2][0] == 'dagrangepre':
1897 return optimize(('dagrange', post, x[2][1]), small)
1898 return optimize(('dagrange', post, x[2][1]), small)
1898 elif x[2][0] == 'rangepre':
1899 elif x[2][0] == 'rangepre':
1899 return optimize(('range', post, x[2][1]), small)
1900 return optimize(('range', post, x[2][1]), small)
1900
1901
1901 wa, ta = optimize(x[1], small)
1902 wa, ta = optimize(x[1], small)
1902 wb, tb = optimize(x[2], small)
1903 wb, tb = optimize(x[2], small)
1903 return wa + wb, (op, ta, tb)
1904 return wa + wb, (op, ta, tb)
1904 elif op == 'func':
1905 elif op == 'func':
1905 f = getstring(x[1], _("not a symbol"))
1906 f = getstring(x[1], _("not a symbol"))
1906 wa, ta = optimize(x[2], small)
1907 wa, ta = optimize(x[2], small)
1907 if f in ("author branch closed date desc file grep keyword "
1908 if f in ("author branch closed date desc file grep keyword "
1908 "outgoing user"):
1909 "outgoing user"):
1909 w = 10 # slow
1910 w = 10 # slow
1910 elif f in "modifies adds removes":
1911 elif f in "modifies adds removes":
1911 w = 30 # slower
1912 w = 30 # slower
1912 elif f == "contains":
1913 elif f == "contains":
1913 w = 100 # very slow
1914 w = 100 # very slow
1914 elif f == "ancestor":
1915 elif f == "ancestor":
1915 w = 1 * smallbonus
1916 w = 1 * smallbonus
1916 elif f in "reverse limit first _intlist":
1917 elif f in "reverse limit first _intlist":
1917 w = 0
1918 w = 0
1918 elif f in "sort":
1919 elif f in "sort":
1919 w = 10 # assume most sorts look at changelog
1920 w = 10 # assume most sorts look at changelog
1920 else:
1921 else:
1921 w = 1
1922 w = 1
1922 return w + wa, (op, x[1], ta)
1923 return w + wa, (op, x[1], ta)
1923 return 1, x
1924 return 1, x
1924
1925
1925 _aliasarg = ('func', ('symbol', '_aliasarg'))
1926 _aliasarg = ('func', ('symbol', '_aliasarg'))
1926 def _getaliasarg(tree):
1927 def _getaliasarg(tree):
1927 """If tree matches ('func', ('symbol', '_aliasarg'), ('string', X))
1928 """If tree matches ('func', ('symbol', '_aliasarg'), ('string', X))
1928 return X, None otherwise.
1929 return X, None otherwise.
1929 """
1930 """
1930 if (len(tree) == 3 and tree[:2] == _aliasarg
1931 if (len(tree) == 3 and tree[:2] == _aliasarg
1931 and tree[2][0] == 'string'):
1932 and tree[2][0] == 'string'):
1932 return tree[2][1]
1933 return tree[2][1]
1933 return None
1934 return None
1934
1935
1935 def _checkaliasarg(tree, known=None):
1936 def _checkaliasarg(tree, known=None):
1936 """Check tree contains no _aliasarg construct or only ones which
1937 """Check tree contains no _aliasarg construct or only ones which
1937 value is in known. Used to avoid alias placeholders injection.
1938 value is in known. Used to avoid alias placeholders injection.
1938 """
1939 """
1939 if isinstance(tree, tuple):
1940 if isinstance(tree, tuple):
1940 arg = _getaliasarg(tree)
1941 arg = _getaliasarg(tree)
1941 if arg is not None and (not known or arg not in known):
1942 if arg is not None and (not known or arg not in known):
1942 raise error.ParseError(_("not a function: %s") % '_aliasarg')
1943 raise error.ParseError(_("not a function: %s") % '_aliasarg')
1943 for t in tree:
1944 for t in tree:
1944 _checkaliasarg(t, known)
1945 _checkaliasarg(t, known)
1945
1946
1946 class revsetalias(object):
1947 class revsetalias(object):
1947 funcre = re.compile('^([^(]+)\(([^)]+)\)$')
1948 funcre = re.compile('^([^(]+)\(([^)]+)\)$')
1948 args = None
1949 args = None
1949
1950
1950 def __init__(self, name, value):
1951 def __init__(self, name, value):
1951 '''Aliases like:
1952 '''Aliases like:
1952
1953
1953 h = heads(default)
1954 h = heads(default)
1954 b($1) = ancestors($1) - ancestors(default)
1955 b($1) = ancestors($1) - ancestors(default)
1955 '''
1956 '''
1956 m = self.funcre.search(name)
1957 m = self.funcre.search(name)
1957 if m:
1958 if m:
1958 self.name = m.group(1)
1959 self.name = m.group(1)
1959 self.tree = ('func', ('symbol', m.group(1)))
1960 self.tree = ('func', ('symbol', m.group(1)))
1960 self.args = [x.strip() for x in m.group(2).split(',')]
1961 self.args = [x.strip() for x in m.group(2).split(',')]
1961 for arg in self.args:
1962 for arg in self.args:
1962 # _aliasarg() is an unknown symbol only used separate
1963 # _aliasarg() is an unknown symbol only used separate
1963 # alias argument placeholders from regular strings.
1964 # alias argument placeholders from regular strings.
1964 value = value.replace(arg, '_aliasarg(%r)' % (arg,))
1965 value = value.replace(arg, '_aliasarg(%r)' % (arg,))
1965 else:
1966 else:
1966 self.name = name
1967 self.name = name
1967 self.tree = ('symbol', name)
1968 self.tree = ('symbol', name)
1968
1969
1969 self.replacement, pos = parse(value)
1970 self.replacement, pos = parse(value)
1970 if pos != len(value):
1971 if pos != len(value):
1971 raise error.ParseError(_('invalid token'), pos)
1972 raise error.ParseError(_('invalid token'), pos)
1972 # Check for placeholder injection
1973 # Check for placeholder injection
1973 _checkaliasarg(self.replacement, self.args)
1974 _checkaliasarg(self.replacement, self.args)
1974
1975
1975 def _getalias(aliases, tree):
1976 def _getalias(aliases, tree):
1976 """If tree looks like an unexpanded alias, return it. Return None
1977 """If tree looks like an unexpanded alias, return it. Return None
1977 otherwise.
1978 otherwise.
1978 """
1979 """
1979 if isinstance(tree, tuple) and tree:
1980 if isinstance(tree, tuple) and tree:
1980 if tree[0] == 'symbol' and len(tree) == 2:
1981 if tree[0] == 'symbol' and len(tree) == 2:
1981 name = tree[1]
1982 name = tree[1]
1982 alias = aliases.get(name)
1983 alias = aliases.get(name)
1983 if alias and alias.args is None and alias.tree == tree:
1984 if alias and alias.args is None and alias.tree == tree:
1984 return alias
1985 return alias
1985 if tree[0] == 'func' and len(tree) > 1:
1986 if tree[0] == 'func' and len(tree) > 1:
1986 if tree[1][0] == 'symbol' and len(tree[1]) == 2:
1987 if tree[1][0] == 'symbol' and len(tree[1]) == 2:
1987 name = tree[1][1]
1988 name = tree[1][1]
1988 alias = aliases.get(name)
1989 alias = aliases.get(name)
1989 if alias and alias.args is not None and alias.tree == tree[:2]:
1990 if alias and alias.args is not None and alias.tree == tree[:2]:
1990 return alias
1991 return alias
1991 return None
1992 return None
1992
1993
1993 def _expandargs(tree, args):
1994 def _expandargs(tree, args):
1994 """Replace _aliasarg instances with the substitution value of the
1995 """Replace _aliasarg instances with the substitution value of the
1995 same name in args, recursively.
1996 same name in args, recursively.
1996 """
1997 """
1997 if not tree or not isinstance(tree, tuple):
1998 if not tree or not isinstance(tree, tuple):
1998 return tree
1999 return tree
1999 arg = _getaliasarg(tree)
2000 arg = _getaliasarg(tree)
2000 if arg is not None:
2001 if arg is not None:
2001 return args[arg]
2002 return args[arg]
2002 return tuple(_expandargs(t, args) for t in tree)
2003 return tuple(_expandargs(t, args) for t in tree)
2003
2004
2004 def _expandaliases(aliases, tree, expanding, cache):
2005 def _expandaliases(aliases, tree, expanding, cache):
2005 """Expand aliases in tree, recursively.
2006 """Expand aliases in tree, recursively.
2006
2007
2007 'aliases' is a dictionary mapping user defined aliases to
2008 'aliases' is a dictionary mapping user defined aliases to
2008 revsetalias objects.
2009 revsetalias objects.
2009 """
2010 """
2010 if not isinstance(tree, tuple):
2011 if not isinstance(tree, tuple):
2011 # Do not expand raw strings
2012 # Do not expand raw strings
2012 return tree
2013 return tree
2013 alias = _getalias(aliases, tree)
2014 alias = _getalias(aliases, tree)
2014 if alias is not None:
2015 if alias is not None:
2015 if alias in expanding:
2016 if alias in expanding:
2016 raise error.ParseError(_('infinite expansion of revset alias "%s" '
2017 raise error.ParseError(_('infinite expansion of revset alias "%s" '
2017 'detected') % alias.name)
2018 'detected') % alias.name)
2018 expanding.append(alias)
2019 expanding.append(alias)
2019 if alias.name not in cache:
2020 if alias.name not in cache:
2020 cache[alias.name] = _expandaliases(aliases, alias.replacement,
2021 cache[alias.name] = _expandaliases(aliases, alias.replacement,
2021 expanding, cache)
2022 expanding, cache)
2022 result = cache[alias.name]
2023 result = cache[alias.name]
2023 expanding.pop()
2024 expanding.pop()
2024 if alias.args is not None:
2025 if alias.args is not None:
2025 l = getlist(tree[2])
2026 l = getlist(tree[2])
2026 if len(l) != len(alias.args):
2027 if len(l) != len(alias.args):
2027 raise error.ParseError(
2028 raise error.ParseError(
2028 _('invalid number of arguments: %s') % len(l))
2029 _('invalid number of arguments: %s') % len(l))
2029 l = [_expandaliases(aliases, a, [], cache) for a in l]
2030 l = [_expandaliases(aliases, a, [], cache) for a in l]
2030 result = _expandargs(result, dict(zip(alias.args, l)))
2031 result = _expandargs(result, dict(zip(alias.args, l)))
2031 else:
2032 else:
2032 result = tuple(_expandaliases(aliases, t, expanding, cache)
2033 result = tuple(_expandaliases(aliases, t, expanding, cache)
2033 for t in tree)
2034 for t in tree)
2034 return result
2035 return result
2035
2036
2036 def findaliases(ui, tree):
2037 def findaliases(ui, tree):
2037 _checkaliasarg(tree)
2038 _checkaliasarg(tree)
2038 aliases = {}
2039 aliases = {}
2039 for k, v in ui.configitems('revsetalias'):
2040 for k, v in ui.configitems('revsetalias'):
2040 alias = revsetalias(k, v)
2041 alias = revsetalias(k, v)
2041 aliases[alias.name] = alias
2042 aliases[alias.name] = alias
2042 return _expandaliases(aliases, tree, [], {})
2043 return _expandaliases(aliases, tree, [], {})
2043
2044
2044 def parse(spec, lookup=None):
2045 def parse(spec, lookup=None):
2045 p = parser.parser(tokenize, elements)
2046 p = parser.parser(tokenize, elements)
2046 return p.parse(spec, lookup=lookup)
2047 return p.parse(spec, lookup=lookup)
2047
2048
2048 def match(ui, spec, repo=None):
2049 def match(ui, spec, repo=None):
2049 if not spec:
2050 if not spec:
2050 raise error.ParseError(_("empty query"))
2051 raise error.ParseError(_("empty query"))
2051 lookup = None
2052 lookup = None
2052 if repo:
2053 if repo:
2053 lookup = repo.__contains__
2054 lookup = repo.__contains__
2054 tree, pos = parse(spec, lookup)
2055 tree, pos = parse(spec, lookup)
2055 if (pos != len(spec)):
2056 if (pos != len(spec)):
2056 raise error.ParseError(_("invalid token"), pos)
2057 raise error.ParseError(_("invalid token"), pos)
2057 if ui:
2058 if ui:
2058 tree = findaliases(ui, tree)
2059 tree = findaliases(ui, tree)
2059 weight, tree = optimize(tree, True)
2060 weight, tree = optimize(tree, True)
2060 def mfunc(repo, subset):
2061 def mfunc(repo, subset):
2061 if util.safehasattr(subset, 'set'):
2062 if util.safehasattr(subset, 'set'):
2062 return getset(repo, subset, tree)
2063 return getset(repo, subset, tree)
2063 return getset(repo, baseset(subset), tree)
2064 return getset(repo, baseset(subset), tree)
2064 return mfunc
2065 return mfunc
2065
2066
2066 def formatspec(expr, *args):
2067 def formatspec(expr, *args):
2067 '''
2068 '''
2068 This is a convenience function for using revsets internally, and
2069 This is a convenience function for using revsets internally, and
2069 escapes arguments appropriately. Aliases are intentionally ignored
2070 escapes arguments appropriately. Aliases are intentionally ignored
2070 so that intended expression behavior isn't accidentally subverted.
2071 so that intended expression behavior isn't accidentally subverted.
2071
2072
2072 Supported arguments:
2073 Supported arguments:
2073
2074
2074 %r = revset expression, parenthesized
2075 %r = revset expression, parenthesized
2075 %d = int(arg), no quoting
2076 %d = int(arg), no quoting
2076 %s = string(arg), escaped and single-quoted
2077 %s = string(arg), escaped and single-quoted
2077 %b = arg.branch(), escaped and single-quoted
2078 %b = arg.branch(), escaped and single-quoted
2078 %n = hex(arg), single-quoted
2079 %n = hex(arg), single-quoted
2079 %% = a literal '%'
2080 %% = a literal '%'
2080
2081
2081 Prefixing the type with 'l' specifies a parenthesized list of that type.
2082 Prefixing the type with 'l' specifies a parenthesized list of that type.
2082
2083
2083 >>> formatspec('%r:: and %lr', '10 or 11', ("this()", "that()"))
2084 >>> formatspec('%r:: and %lr', '10 or 11', ("this()", "that()"))
2084 '(10 or 11):: and ((this()) or (that()))'
2085 '(10 or 11):: and ((this()) or (that()))'
2085 >>> formatspec('%d:: and not %d::', 10, 20)
2086 >>> formatspec('%d:: and not %d::', 10, 20)
2086 '10:: and not 20::'
2087 '10:: and not 20::'
2087 >>> formatspec('%ld or %ld', [], [1])
2088 >>> formatspec('%ld or %ld', [], [1])
2088 "_list('') or 1"
2089 "_list('') or 1"
2089 >>> formatspec('keyword(%s)', 'foo\\xe9')
2090 >>> formatspec('keyword(%s)', 'foo\\xe9')
2090 "keyword('foo\\\\xe9')"
2091 "keyword('foo\\\\xe9')"
2091 >>> b = lambda: 'default'
2092 >>> b = lambda: 'default'
2092 >>> b.branch = b
2093 >>> b.branch = b
2093 >>> formatspec('branch(%b)', b)
2094 >>> formatspec('branch(%b)', b)
2094 "branch('default')"
2095 "branch('default')"
2095 >>> formatspec('root(%ls)', ['a', 'b', 'c', 'd'])
2096 >>> formatspec('root(%ls)', ['a', 'b', 'c', 'd'])
2096 "root(_list('a\\x00b\\x00c\\x00d'))"
2097 "root(_list('a\\x00b\\x00c\\x00d'))"
2097 '''
2098 '''
2098
2099
2099 def quote(s):
2100 def quote(s):
2100 return repr(str(s))
2101 return repr(str(s))
2101
2102
2102 def argtype(c, arg):
2103 def argtype(c, arg):
2103 if c == 'd':
2104 if c == 'd':
2104 return str(int(arg))
2105 return str(int(arg))
2105 elif c == 's':
2106 elif c == 's':
2106 return quote(arg)
2107 return quote(arg)
2107 elif c == 'r':
2108 elif c == 'r':
2108 parse(arg) # make sure syntax errors are confined
2109 parse(arg) # make sure syntax errors are confined
2109 return '(%s)' % arg
2110 return '(%s)' % arg
2110 elif c == 'n':
2111 elif c == 'n':
2111 return quote(node.hex(arg))
2112 return quote(node.hex(arg))
2112 elif c == 'b':
2113 elif c == 'b':
2113 return quote(arg.branch())
2114 return quote(arg.branch())
2114
2115
2115 def listexp(s, t):
2116 def listexp(s, t):
2116 l = len(s)
2117 l = len(s)
2117 if l == 0:
2118 if l == 0:
2118 return "_list('')"
2119 return "_list('')"
2119 elif l == 1:
2120 elif l == 1:
2120 return argtype(t, s[0])
2121 return argtype(t, s[0])
2121 elif t == 'd':
2122 elif t == 'd':
2122 return "_intlist('%s')" % "\0".join(str(int(a)) for a in s)
2123 return "_intlist('%s')" % "\0".join(str(int(a)) for a in s)
2123 elif t == 's':
2124 elif t == 's':
2124 return "_list('%s')" % "\0".join(s)
2125 return "_list('%s')" % "\0".join(s)
2125 elif t == 'n':
2126 elif t == 'n':
2126 return "_hexlist('%s')" % "\0".join(node.hex(a) for a in s)
2127 return "_hexlist('%s')" % "\0".join(node.hex(a) for a in s)
2127 elif t == 'b':
2128 elif t == 'b':
2128 return "_list('%s')" % "\0".join(a.branch() for a in s)
2129 return "_list('%s')" % "\0".join(a.branch() for a in s)
2129
2130
2130 m = l // 2
2131 m = l // 2
2131 return '(%s or %s)' % (listexp(s[:m], t), listexp(s[m:], t))
2132 return '(%s or %s)' % (listexp(s[:m], t), listexp(s[m:], t))
2132
2133
2133 ret = ''
2134 ret = ''
2134 pos = 0
2135 pos = 0
2135 arg = 0
2136 arg = 0
2136 while pos < len(expr):
2137 while pos < len(expr):
2137 c = expr[pos]
2138 c = expr[pos]
2138 if c == '%':
2139 if c == '%':
2139 pos += 1
2140 pos += 1
2140 d = expr[pos]
2141 d = expr[pos]
2141 if d == '%':
2142 if d == '%':
2142 ret += d
2143 ret += d
2143 elif d in 'dsnbr':
2144 elif d in 'dsnbr':
2144 ret += argtype(d, args[arg])
2145 ret += argtype(d, args[arg])
2145 arg += 1
2146 arg += 1
2146 elif d == 'l':
2147 elif d == 'l':
2147 # a list of some type
2148 # a list of some type
2148 pos += 1
2149 pos += 1
2149 d = expr[pos]
2150 d = expr[pos]
2150 ret += listexp(list(args[arg]), d)
2151 ret += listexp(list(args[arg]), d)
2151 arg += 1
2152 arg += 1
2152 else:
2153 else:
2153 raise util.Abort('unexpected revspec format character %s' % d)
2154 raise util.Abort('unexpected revspec format character %s' % d)
2154 else:
2155 else:
2155 ret += c
2156 ret += c
2156 pos += 1
2157 pos += 1
2157
2158
2158 return ret
2159 return ret
2159
2160
2160 def prettyformat(tree):
2161 def prettyformat(tree):
2161 def _prettyformat(tree, level, lines):
2162 def _prettyformat(tree, level, lines):
2162 if not isinstance(tree, tuple) or tree[0] in ('string', 'symbol'):
2163 if not isinstance(tree, tuple) or tree[0] in ('string', 'symbol'):
2163 lines.append((level, str(tree)))
2164 lines.append((level, str(tree)))
2164 else:
2165 else:
2165 lines.append((level, '(%s' % tree[0]))
2166 lines.append((level, '(%s' % tree[0]))
2166 for s in tree[1:]:
2167 for s in tree[1:]:
2167 _prettyformat(s, level + 1, lines)
2168 _prettyformat(s, level + 1, lines)
2168 lines[-1:] = [(lines[-1][0], lines[-1][1] + ')')]
2169 lines[-1:] = [(lines[-1][0], lines[-1][1] + ')')]
2169
2170
2170 lines = []
2171 lines = []
2171 _prettyformat(tree, 0, lines)
2172 _prettyformat(tree, 0, lines)
2172 output = '\n'.join((' '*l + s) for l, s in lines)
2173 output = '\n'.join((' '*l + s) for l, s in lines)
2173 return output
2174 return output
2174
2175
2175 def depth(tree):
2176 def depth(tree):
2176 if isinstance(tree, tuple):
2177 if isinstance(tree, tuple):
2177 return max(map(depth, tree)) + 1
2178 return max(map(depth, tree)) + 1
2178 else:
2179 else:
2179 return 0
2180 return 0
2180
2181
2181 def funcsused(tree):
2182 def funcsused(tree):
2182 if not isinstance(tree, tuple) or tree[0] in ('string', 'symbol'):
2183 if not isinstance(tree, tuple) or tree[0] in ('string', 'symbol'):
2183 return set()
2184 return set()
2184 else:
2185 else:
2185 funcs = set()
2186 funcs = set()
2186 for s in tree[1:]:
2187 for s in tree[1:]:
2187 funcs |= funcsused(s)
2188 funcs |= funcsused(s)
2188 if tree[0] == 'func':
2189 if tree[0] == 'func':
2189 funcs.add(tree[1][1])
2190 funcs.add(tree[1][1])
2190 return funcs
2191 return funcs
2191
2192
2192 class baseset(list):
2193 class baseset(list):
2193 """Basic data structure that represents a revset and contains the basic
2194 """Basic data structure that represents a revset and contains the basic
2194 operation that it should be able to perform.
2195 operation that it should be able to perform.
2195
2196
2196 Every method in this class should be implemented by any smartset class.
2197 Every method in this class should be implemented by any smartset class.
2197 """
2198 """
2198 def __init__(self, data=()):
2199 def __init__(self, data=()):
2199 super(baseset, self).__init__(data)
2200 super(baseset, self).__init__(data)
2200 self._set = None
2201 self._set = None
2201
2202
2202 def ascending(self):
2203 def ascending(self):
2203 """Sorts the set in ascending order (in place).
2204 """Sorts the set in ascending order (in place).
2204
2205
2205 This is part of the mandatory API for smartset."""
2206 This is part of the mandatory API for smartset."""
2206 self.sort()
2207 self.sort()
2207
2208
2208 def descending(self):
2209 def descending(self):
2209 """Sorts the set in descending order (in place).
2210 """Sorts the set in descending order (in place).
2210
2211
2211 This is part of the mandatory API for smartset."""
2212 This is part of the mandatory API for smartset."""
2212 self.sort(reverse=True)
2213 self.sort(reverse=True)
2213
2214
2214 def min(self):
2215 def min(self):
2215 return min(self)
2216 return min(self)
2216
2217
2217 def max(self):
2218 def max(self):
2218 return max(self)
2219 return max(self)
2219
2220
2220 def set(self):
2221 def set(self):
2221 """Returns a set or a smartset containing all the elements.
2222 """Returns a set or a smartset containing all the elements.
2222
2223
2223 The returned structure should be the fastest option for membership
2224 The returned structure should be the fastest option for membership
2224 testing.
2225 testing.
2225
2226
2226 This is part of the mandatory API for smartset."""
2227 This is part of the mandatory API for smartset."""
2227 if not self._set:
2228 if not self._set:
2228 self._set = set(self)
2229 self._set = set(self)
2229 return self._set
2230 return self._set
2230
2231
2231 def __sub__(self, other):
2232 def __sub__(self, other):
2232 """Returns a new object with the substraction of the two collections.
2233 """Returns a new object with the substraction of the two collections.
2233
2234
2234 This is part of the mandatory API for smartset."""
2235 This is part of the mandatory API for smartset."""
2235 # If we are operating on 2 baseset, do the computation now since all
2236 # If we are operating on 2 baseset, do the computation now since all
2236 # data is available. The alternative is to involve a lazyset, which
2237 # data is available. The alternative is to involve a lazyset, which
2237 # may be slow.
2238 # may be slow.
2238 if isinstance(other, baseset):
2239 if isinstance(other, baseset):
2239 other = other.set()
2240 other = other.set()
2240 return baseset([x for x in self if x not in other])
2241 return baseset([x for x in self if x not in other])
2241
2242
2242 return self.filter(lambda x: x not in other)
2243 return self.filter(lambda x: x not in other)
2243
2244
2244 def __and__(self, other):
2245 def __and__(self, other):
2245 """Returns a new object with the intersection of the two collections.
2246 """Returns a new object with the intersection of the two collections.
2246
2247
2247 This is part of the mandatory API for smartset."""
2248 This is part of the mandatory API for smartset."""
2248 if isinstance(other, baseset):
2249 if isinstance(other, baseset):
2249 other = other.set()
2250 other = other.set()
2250 return baseset([y for y in self if y in other])
2251 return baseset([y for y in self if y in other])
2251
2252
2252 def __add__(self, other):
2253 def __add__(self, other):
2253 """Returns a new object with the union of the two collections.
2254 """Returns a new object with the union of the two collections.
2254
2255
2255 This is part of the mandatory API for smartset."""
2256 This is part of the mandatory API for smartset."""
2256 s = self.set()
2257 s = self.set()
2257 l = [r for r in other if r not in s]
2258 l = [r for r in other if r not in s]
2258 return baseset(list(self) + l)
2259 return baseset(list(self) + l)
2259
2260
2260 def isascending(self):
2261 def isascending(self):
2261 """Returns True if the collection is ascending order, False if not.
2262 """Returns True if the collection is ascending order, False if not.
2262
2263
2263 This is part of the mandatory API for smartset."""
2264 This is part of the mandatory API for smartset."""
2264 return False
2265 return False
2265
2266
2266 def isdescending(self):
2267 def isdescending(self):
2267 """Returns True if the collection is descending order, False if not.
2268 """Returns True if the collection is descending order, False if not.
2268
2269
2269 This is part of the mandatory API for smartset."""
2270 This is part of the mandatory API for smartset."""
2270 return False
2271 return False
2271
2272
2272 def filter(self, condition):
2273 def filter(self, condition):
2273 """Returns this smartset filtered by condition as a new smartset.
2274 """Returns this smartset filtered by condition as a new smartset.
2274
2275
2275 `condition` is a callable which takes a revision number and returns a
2276 `condition` is a callable which takes a revision number and returns a
2276 boolean.
2277 boolean.
2277
2278
2278 This is part of the mandatory API for smartset."""
2279 This is part of the mandatory API for smartset."""
2279 return lazyset(self, condition)
2280 return lazyset(self, condition)
2280
2281
2281 class _orderedsetmixin(object):
2282 class _orderedsetmixin(object):
2282 """Mixin class with utility methods for smartsets
2283 """Mixin class with utility methods for smartsets
2283
2284
2284 This should be extended by smartsets which have the isascending(),
2285 This should be extended by smartsets which have the isascending(),
2285 isdescending() and reverse() methods"""
2286 isdescending() and reverse() methods"""
2286
2287
2287 def _first(self):
2288 def _first(self):
2288 """return the first revision in the set"""
2289 """return the first revision in the set"""
2289 for r in self:
2290 for r in self:
2290 return r
2291 return r
2291 raise ValueError('arg is an empty sequence')
2292 raise ValueError('arg is an empty sequence')
2292
2293
2293 def _last(self):
2294 def _last(self):
2294 """return the last revision in the set"""
2295 """return the last revision in the set"""
2295 self.reverse()
2296 self.reverse()
2296 m = self._first()
2297 m = self._first()
2297 self.reverse()
2298 self.reverse()
2298 return m
2299 return m
2299
2300
2300 def min(self):
2301 def min(self):
2301 """return the smallest element in the set"""
2302 """return the smallest element in the set"""
2302 if self.isascending():
2303 if self.isascending():
2303 return self._first()
2304 return self._first()
2304 return self._last()
2305 return self._last()
2305
2306
2306 def max(self):
2307 def max(self):
2307 """return the largest element in the set"""
2308 """return the largest element in the set"""
2308 if self.isascending():
2309 if self.isascending():
2309 return self._last()
2310 return self._last()
2310 return self._first()
2311 return self._first()
2311
2312
2312 class lazyset(object):
2313 class lazyset(object):
2313 """Duck type for baseset class which iterates lazily over the revisions in
2314 """Duck type for baseset class which iterates lazily over the revisions in
2314 the subset and contains a function which tests for membership in the
2315 the subset and contains a function which tests for membership in the
2315 revset
2316 revset
2316 """
2317 """
2317 def __init__(self, subset, condition=lambda x: True):
2318 def __init__(self, subset, condition=lambda x: True):
2318 """
2319 """
2319 condition: a function that decide whether a revision in the subset
2320 condition: a function that decide whether a revision in the subset
2320 belongs to the revset or not.
2321 belongs to the revset or not.
2321 """
2322 """
2322 self._subset = subset
2323 self._subset = subset
2323 self._condition = condition
2324 self._condition = condition
2324 self._cache = {}
2325 self._cache = {}
2325
2326
2326 def ascending(self):
2327 def ascending(self):
2327 self._subset.sort()
2328 self._subset.sort()
2328
2329
2329 def descending(self):
2330 def descending(self):
2330 self._subset.sort(reverse=True)
2331 self._subset.sort(reverse=True)
2331
2332
2332 def min(self):
2333 def min(self):
2333 return min(self)
2334 return min(self)
2334
2335
2335 def max(self):
2336 def max(self):
2336 return max(self)
2337 return max(self)
2337
2338
2338 def __contains__(self, x):
2339 def __contains__(self, x):
2339 c = self._cache
2340 c = self._cache
2340 if x not in c:
2341 if x not in c:
2341 c[x] = x in self._subset and self._condition(x)
2342 c[x] = x in self._subset and self._condition(x)
2342 return c[x]
2343 return c[x]
2343
2344
2344 def __iter__(self):
2345 def __iter__(self):
2345 cond = self._condition
2346 cond = self._condition
2346 for x in self._subset:
2347 for x in self._subset:
2347 if cond(x):
2348 if cond(x):
2348 yield x
2349 yield x
2349
2350
2350 def __and__(self, x):
2351 def __and__(self, x):
2351 return lazyset(self, x.__contains__)
2352 return lazyset(self, x.__contains__)
2352
2353
2353 def __sub__(self, x):
2354 def __sub__(self, x):
2354 return lazyset(self, lambda r: r not in x)
2355 return lazyset(self, lambda r: r not in x)
2355
2356
2356 def __add__(self, x):
2357 def __add__(self, x):
2357 return _addset(self, x)
2358 return _addset(self, x)
2358
2359
2359 def __nonzero__(self):
2360 def __nonzero__(self):
2360 for r in self:
2361 for r in self:
2361 return True
2362 return True
2362 return False
2363 return False
2363
2364
2364 def __len__(self):
2365 def __len__(self):
2365 # Basic implementation to be changed in future patches.
2366 # Basic implementation to be changed in future patches.
2366 l = baseset([r for r in self])
2367 l = baseset([r for r in self])
2367 return len(l)
2368 return len(l)
2368
2369
2369 def __getitem__(self, x):
2370 def __getitem__(self, x):
2370 # Basic implementation to be changed in future patches.
2371 # Basic implementation to be changed in future patches.
2371 l = baseset([r for r in self])
2372 l = baseset([r for r in self])
2372 return l[x]
2373 return l[x]
2373
2374
2374 def sort(self, reverse=False):
2375 def sort(self, reverse=False):
2375 if not util.safehasattr(self._subset, 'sort'):
2376 if not util.safehasattr(self._subset, 'sort'):
2376 self._subset = baseset(self._subset)
2377 self._subset = baseset(self._subset)
2377 self._subset.sort(reverse=reverse)
2378 self._subset.sort(reverse=reverse)
2378
2379
2379 def reverse(self):
2380 def reverse(self):
2380 self._subset.reverse()
2381 self._subset.reverse()
2381
2382
2382 def set(self):
2383 def set(self):
2383 return set([r for r in self])
2384 return set([r for r in self])
2384
2385
2385 def isascending(self):
2386 def isascending(self):
2386 return False
2387 return False
2387
2388
2388 def isdescending(self):
2389 def isdescending(self):
2389 return False
2390 return False
2390
2391
2391 def filter(self, l):
2392 def filter(self, l):
2392 return lazyset(self, l)
2393 return lazyset(self, l)
2393
2394
2394 class orderedlazyset(_orderedsetmixin, lazyset):
2395 class orderedlazyset(_orderedsetmixin, lazyset):
2395 """Subclass of lazyset which subset can be ordered either ascending or
2396 """Subclass of lazyset which subset can be ordered either ascending or
2396 descendingly
2397 descendingly
2397 """
2398 """
2398 def __init__(self, subset, condition, ascending=True):
2399 def __init__(self, subset, condition, ascending=True):
2399 super(orderedlazyset, self).__init__(subset, condition)
2400 super(orderedlazyset, self).__init__(subset, condition)
2400 self._ascending = ascending
2401 self._ascending = ascending
2401
2402
2402 def filter(self, l):
2403 def filter(self, l):
2403 return orderedlazyset(self, l, ascending=self._ascending)
2404 return orderedlazyset(self, l, ascending=self._ascending)
2404
2405
2405 def ascending(self):
2406 def ascending(self):
2406 if not self._ascending:
2407 if not self._ascending:
2407 self.reverse()
2408 self.reverse()
2408
2409
2409 def descending(self):
2410 def descending(self):
2410 if self._ascending:
2411 if self._ascending:
2411 self.reverse()
2412 self.reverse()
2412
2413
2413 def __and__(self, x):
2414 def __and__(self, x):
2414 return orderedlazyset(self, x.__contains__,
2415 return orderedlazyset(self, x.__contains__,
2415 ascending=self._ascending)
2416 ascending=self._ascending)
2416
2417
2417 def __sub__(self, x):
2418 def __sub__(self, x):
2418 return orderedlazyset(self, lambda r: r not in x,
2419 return orderedlazyset(self, lambda r: r not in x,
2419 ascending=self._ascending)
2420 ascending=self._ascending)
2420
2421
2421 def __add__(self, x):
2422 def __add__(self, x):
2422 kwargs = {}
2423 kwargs = {}
2423 if self.isascending() and x.isascending():
2424 if self.isascending() and x.isascending():
2424 kwargs['ascending'] = True
2425 kwargs['ascending'] = True
2425 if self.isdescending() and x.isdescending():
2426 if self.isdescending() and x.isdescending():
2426 kwargs['ascending'] = False
2427 kwargs['ascending'] = False
2427 return _addset(self, x, **kwargs)
2428 return _addset(self, x, **kwargs)
2428
2429
2429 def sort(self, reverse=False):
2430 def sort(self, reverse=False):
2430 if reverse:
2431 if reverse:
2431 if self._ascending:
2432 if self._ascending:
2432 self._subset.sort(reverse=reverse)
2433 self._subset.sort(reverse=reverse)
2433 else:
2434 else:
2434 if not self._ascending:
2435 if not self._ascending:
2435 self._subset.sort(reverse=reverse)
2436 self._subset.sort(reverse=reverse)
2436 self._ascending = not reverse
2437 self._ascending = not reverse
2437
2438
2438 def isascending(self):
2439 def isascending(self):
2439 return self._ascending
2440 return self._ascending
2440
2441
2441 def isdescending(self):
2442 def isdescending(self):
2442 return not self._ascending
2443 return not self._ascending
2443
2444
2444 def reverse(self):
2445 def reverse(self):
2445 self._subset.reverse()
2446 self._subset.reverse()
2446 self._ascending = not self._ascending
2447 self._ascending = not self._ascending
2447
2448
2448 class _addset(_orderedsetmixin):
2449 class _addset(_orderedsetmixin):
2449 """Represent the addition of two sets
2450 """Represent the addition of two sets
2450
2451
2451 Wrapper structure for lazily adding two structures without losing much
2452 Wrapper structure for lazily adding two structures without losing much
2452 performance on the __contains__ method
2453 performance on the __contains__ method
2453
2454
2454 If the ascending attribute is set, that means the two structures are
2455 If the ascending attribute is set, that means the two structures are
2455 ordered in either an ascending or descending way. Therefore, we can add
2456 ordered in either an ascending or descending way. Therefore, we can add
2456 them maintaining the order by iterating over both at the same time
2457 them maintaining the order by iterating over both at the same time
2457
2458
2458 This class does not duck-type baseset and it's only supposed to be used
2459 This class does not duck-type baseset and it's only supposed to be used
2459 internally
2460 internally
2460 """
2461 """
2461 def __init__(self, revs1, revs2, ascending=None):
2462 def __init__(self, revs1, revs2, ascending=None):
2462 self._r1 = revs1
2463 self._r1 = revs1
2463 self._r2 = revs2
2464 self._r2 = revs2
2464 self._iter = None
2465 self._iter = None
2465 self._ascending = ascending
2466 self._ascending = ascending
2466 self._genlist = None
2467 self._genlist = None
2467
2468
2468 def __len__(self):
2469 def __len__(self):
2469 return len(self._list)
2470 return len(self._list)
2470
2471
2471 @util.propertycache
2472 @util.propertycache
2472 def _list(self):
2473 def _list(self):
2473 if not self._genlist:
2474 if not self._genlist:
2474 self._genlist = baseset(self._iterator())
2475 self._genlist = baseset(self._iterator())
2475 return self._genlist
2476 return self._genlist
2476
2477
2477 def filter(self, condition):
2478 def filter(self, condition):
2478 if self._ascending is not None:
2479 if self._ascending is not None:
2479 return orderedlazyset(self, condition, ascending=self._ascending)
2480 return orderedlazyset(self, condition, ascending=self._ascending)
2480 return lazyset(self, condition)
2481 return lazyset(self, condition)
2481
2482
2482 def ascending(self):
2483 def ascending(self):
2483 if self._ascending is None:
2484 if self._ascending is None:
2484 self.sort()
2485 self.sort()
2485 self._ascending = True
2486 self._ascending = True
2486 else:
2487 else:
2487 if not self._ascending:
2488 if not self._ascending:
2488 self.reverse()
2489 self.reverse()
2489
2490
2490 def descending(self):
2491 def descending(self):
2491 if self._ascending is None:
2492 if self._ascending is None:
2492 self.sort(reverse=True)
2493 self.sort(reverse=True)
2493 self._ascending = False
2494 self._ascending = False
2494 else:
2495 else:
2495 if self._ascending:
2496 if self._ascending:
2496 self.reverse()
2497 self.reverse()
2497
2498
2498 def __and__(self, other):
2499 def __and__(self, other):
2499 filterfunc = other.__contains__
2500 filterfunc = other.__contains__
2500 if self._ascending is not None:
2501 if self._ascending is not None:
2501 return orderedlazyset(self, filterfunc, ascending=self._ascending)
2502 return orderedlazyset(self, filterfunc, ascending=self._ascending)
2502 return lazyset(self, filterfunc)
2503 return lazyset(self, filterfunc)
2503
2504
2504 def __sub__(self, other):
2505 def __sub__(self, other):
2505 filterfunc = lambda r: r not in other
2506 filterfunc = lambda r: r not in other
2506 if self._ascending is not None:
2507 if self._ascending is not None:
2507 return orderedlazyset(self, filterfunc, ascending=self._ascending)
2508 return orderedlazyset(self, filterfunc, ascending=self._ascending)
2508 return lazyset(self, filterfunc)
2509 return lazyset(self, filterfunc)
2509
2510
2510 def __add__(self, other):
2511 def __add__(self, other):
2511 """When both collections are ascending or descending, preserve the order
2512 """When both collections are ascending or descending, preserve the order
2512 """
2513 """
2513 kwargs = {}
2514 kwargs = {}
2514 if self._ascending is not None:
2515 if self._ascending is not None:
2515 if self.isascending() and other.isascending():
2516 if self.isascending() and other.isascending():
2516 kwargs['ascending'] = True
2517 kwargs['ascending'] = True
2517 if self.isdescending() and other.isdescending():
2518 if self.isdescending() and other.isdescending():
2518 kwargs['ascending'] = False
2519 kwargs['ascending'] = False
2519 return _addset(self, other, **kwargs)
2520 return _addset(self, other, **kwargs)
2520
2521
2521 def _iterator(self):
2522 def _iterator(self):
2522 """Iterate over both collections without repeating elements
2523 """Iterate over both collections without repeating elements
2523
2524
2524 If the ascending attribute is not set, iterate over the first one and
2525 If the ascending attribute is not set, iterate over the first one and
2525 then over the second one checking for membership on the first one so we
2526 then over the second one checking for membership on the first one so we
2526 dont yield any duplicates.
2527 dont yield any duplicates.
2527
2528
2528 If the ascending attribute is set, iterate over both collections at the
2529 If the ascending attribute is set, iterate over both collections at the
2529 same time, yielding only one value at a time in the given order.
2530 same time, yielding only one value at a time in the given order.
2530 """
2531 """
2531 if not self._iter:
2532 if not self._iter:
2532 def gen():
2533 def gen():
2533 if self._ascending is None:
2534 if self._ascending is None:
2534 for r in self._r1:
2535 for r in self._r1:
2535 yield r
2536 yield r
2536 s = self._r1.set()
2537 s = self._r1.set()
2537 for r in self._r2:
2538 for r in self._r2:
2538 if r not in s:
2539 if r not in s:
2539 yield r
2540 yield r
2540 else:
2541 else:
2541 iter1 = iter(self._r1)
2542 iter1 = iter(self._r1)
2542 iter2 = iter(self._r2)
2543 iter2 = iter(self._r2)
2543
2544
2544 val1 = None
2545 val1 = None
2545 val2 = None
2546 val2 = None
2546
2547
2547 choice = max
2548 choice = max
2548 if self._ascending:
2549 if self._ascending:
2549 choice = min
2550 choice = min
2550 try:
2551 try:
2551 # Consume both iterators in an ordered way until one is
2552 # Consume both iterators in an ordered way until one is
2552 # empty
2553 # empty
2553 while True:
2554 while True:
2554 if val1 is None:
2555 if val1 is None:
2555 val1 = iter1.next()
2556 val1 = iter1.next()
2556 if val2 is None:
2557 if val2 is None:
2557 val2 = iter2.next()
2558 val2 = iter2.next()
2558 next = choice(val1, val2)
2559 next = choice(val1, val2)
2559 yield next
2560 yield next
2560 if val1 == next:
2561 if val1 == next:
2561 val1 = None
2562 val1 = None
2562 if val2 == next:
2563 if val2 == next:
2563 val2 = None
2564 val2 = None
2564 except StopIteration:
2565 except StopIteration:
2565 # Flush any remaining values and consume the other one
2566 # Flush any remaining values and consume the other one
2566 it = iter2
2567 it = iter2
2567 if val1 is not None:
2568 if val1 is not None:
2568 yield val1
2569 yield val1
2569 it = iter1
2570 it = iter1
2570 elif val2 is not None:
2571 elif val2 is not None:
2571 # might have been equality and both are empty
2572 # might have been equality and both are empty
2572 yield val2
2573 yield val2
2573 for val in it:
2574 for val in it:
2574 yield val
2575 yield val
2575
2576
2576 self._iter = _generatorset(gen())
2577 self._iter = _generatorset(gen())
2577
2578
2578 return self._iter
2579 return self._iter
2579
2580
2580 def __iter__(self):
2581 def __iter__(self):
2581 if self._genlist:
2582 if self._genlist:
2582 return iter(self._genlist)
2583 return iter(self._genlist)
2583 return iter(self._iterator())
2584 return iter(self._iterator())
2584
2585
2585 def __contains__(self, x):
2586 def __contains__(self, x):
2586 return x in self._r1 or x in self._r2
2587 return x in self._r1 or x in self._r2
2587
2588
2588 def set(self):
2589 def set(self):
2589 return self
2590 return self
2590
2591
2591 def sort(self, reverse=False):
2592 def sort(self, reverse=False):
2592 """Sort the added set
2593 """Sort the added set
2593
2594
2594 For this we use the cached list with all the generated values and if we
2595 For this we use the cached list with all the generated values and if we
2595 know they are ascending or descending we can sort them in a smart way.
2596 know they are ascending or descending we can sort them in a smart way.
2596 """
2597 """
2597 if self._ascending is None:
2598 if self._ascending is None:
2598 self._list.sort(reverse=reverse)
2599 self._list.sort(reverse=reverse)
2599 self._ascending = not reverse
2600 self._ascending = not reverse
2600 else:
2601 else:
2601 if bool(self._ascending) == bool(reverse):
2602 if bool(self._ascending) == bool(reverse):
2602 self.reverse()
2603 self.reverse()
2603
2604
2604 def isascending(self):
2605 def isascending(self):
2605 return self._ascending is not None and self._ascending
2606 return self._ascending is not None and self._ascending
2606
2607
2607 def isdescending(self):
2608 def isdescending(self):
2608 return self._ascending is not None and not self._ascending
2609 return self._ascending is not None and not self._ascending
2609
2610
2610 def reverse(self):
2611 def reverse(self):
2611 self._list.reverse()
2612 self._list.reverse()
2612 if self._ascending is not None:
2613 if self._ascending is not None:
2613 self._ascending = not self._ascending
2614 self._ascending = not self._ascending
2614
2615
2615 class _generatorset(object):
2616 class _generatorset(object):
2616 """Wrap a generator for lazy iteration
2617 """Wrap a generator for lazy iteration
2617
2618
2618 Wrapper structure for generators that provides lazy membership and can
2619 Wrapper structure for generators that provides lazy membership and can
2619 be iterated more than once.
2620 be iterated more than once.
2620 When asked for membership it generates values until either it finds the
2621 When asked for membership it generates values until either it finds the
2621 requested one or has gone through all the elements in the generator
2622 requested one or has gone through all the elements in the generator
2622
2623
2623 This class does not duck-type baseset and it's only supposed to be used
2624 This class does not duck-type baseset and it's only supposed to be used
2624 internally
2625 internally
2625 """
2626 """
2626 def __init__(self, gen):
2627 def __init__(self, gen):
2627 """
2628 """
2628 gen: a generator producing the values for the generatorset.
2629 gen: a generator producing the values for the generatorset.
2629 """
2630 """
2630 self._gen = gen
2631 self._gen = gen
2631 self._cache = {}
2632 self._cache = {}
2632 self._genlist = baseset([])
2633 self._genlist = baseset([])
2633 self._finished = False
2634 self._finished = False
2634
2635
2635 def __contains__(self, x):
2636 def __contains__(self, x):
2636 if x in self._cache:
2637 if x in self._cache:
2637 return self._cache[x]
2638 return self._cache[x]
2638
2639
2639 # Use new values only, as existing values would be cached.
2640 # Use new values only, as existing values would be cached.
2640 for l in self._consumegen():
2641 for l in self._consumegen():
2641 if l == x:
2642 if l == x:
2642 return True
2643 return True
2643
2644
2644 self._cache[x] = False
2645 self._cache[x] = False
2645 return False
2646 return False
2646
2647
2647 def __iter__(self):
2648 def __iter__(self):
2648 if self._finished:
2649 if self._finished:
2649 for x in self._genlist:
2650 for x in self._genlist:
2650 yield x
2651 yield x
2651 return
2652 return
2652
2653
2653 # We have to use this complex iteration strategy to allow multiple
2654 # We have to use this complex iteration strategy to allow multiple
2654 # iterations at the same time. We need to be able to catch revision
2655 # iterations at the same time. We need to be able to catch revision
2655 # removed from `consumegen` and added to genlist in another instance.
2656 # removed from `consumegen` and added to genlist in another instance.
2656 #
2657 #
2657 # Getting rid of it would provide an about 15% speed up on this
2658 # Getting rid of it would provide an about 15% speed up on this
2658 # iteration.
2659 # iteration.
2659 i = 0
2660 i = 0
2660 genlist = self._genlist
2661 genlist = self._genlist
2661 consume = self._consumegen()
2662 consume = self._consumegen()
2662 while True:
2663 while True:
2663 if i < len(genlist):
2664 if i < len(genlist):
2664 yield genlist[i]
2665 yield genlist[i]
2665 else:
2666 else:
2666 yield consume.next()
2667 yield consume.next()
2667 i += 1
2668 i += 1
2668
2669
2669 def _consumegen(self):
2670 def _consumegen(self):
2670 for item in self._gen:
2671 for item in self._gen:
2671 self._cache[item] = True
2672 self._cache[item] = True
2672 self._genlist.append(item)
2673 self._genlist.append(item)
2673 yield item
2674 yield item
2674 self._finished = True
2675 self._finished = True
2675
2676
2676 def set(self):
2677 def set(self):
2677 return self
2678 return self
2678
2679
2679 def sort(self, reverse=False):
2680 def sort(self, reverse=False):
2680 if not self._finished:
2681 if not self._finished:
2681 for i in self:
2682 for i in self:
2682 continue
2683 continue
2683 self._genlist.sort(reverse=reverse)
2684 self._genlist.sort(reverse=reverse)
2684
2685
2685 class _ascgeneratorset(_generatorset):
2686 class _ascgeneratorset(_generatorset):
2686 """Wrap a generator of ascending elements for lazy iteration
2687 """Wrap a generator of ascending elements for lazy iteration
2687
2688
2688 Same structure as _generatorset but stops iterating after it goes past
2689 Same structure as _generatorset but stops iterating after it goes past
2689 the value when asked for membership and the element is not contained
2690 the value when asked for membership and the element is not contained
2690
2691
2691 This class does not duck-type baseset and it's only supposed to be used
2692 This class does not duck-type baseset and it's only supposed to be used
2692 internally
2693 internally
2693 """
2694 """
2694 def __contains__(self, x):
2695 def __contains__(self, x):
2695 if x in self._cache:
2696 if x in self._cache:
2696 return self._cache[x]
2697 return self._cache[x]
2697
2698
2698 # Use new values only, as existing values would be cached.
2699 # Use new values only, as existing values would be cached.
2699 for l in self._consumegen():
2700 for l in self._consumegen():
2700 if l == x:
2701 if l == x:
2701 return True
2702 return True
2702 if l > x:
2703 if l > x:
2703 break
2704 break
2704
2705
2705 self._cache[x] = False
2706 self._cache[x] = False
2706 return False
2707 return False
2707
2708
2708 class _descgeneratorset(_generatorset):
2709 class _descgeneratorset(_generatorset):
2709 """Wrap a generator of descending elements for lazy iteration
2710 """Wrap a generator of descending elements for lazy iteration
2710
2711
2711 Same structure as _generatorset but stops iterating after it goes past
2712 Same structure as _generatorset but stops iterating after it goes past
2712 the value when asked for membership and the element is not contained
2713 the value when asked for membership and the element is not contained
2713
2714
2714 This class does not duck-type baseset and it's only supposed to be used
2715 This class does not duck-type baseset and it's only supposed to be used
2715 internally
2716 internally
2716 """
2717 """
2717 def __contains__(self, x):
2718 def __contains__(self, x):
2718 if x in self._cache:
2719 if x in self._cache:
2719 return self._cache[x]
2720 return self._cache[x]
2720
2721
2721 # Use new values only, as existing values would be cached.
2722 # Use new values only, as existing values would be cached.
2722 for l in self._consumegen():
2723 for l in self._consumegen():
2723 if l == x:
2724 if l == x:
2724 return True
2725 return True
2725 if l < x:
2726 if l < x:
2726 break
2727 break
2727
2728
2728 self._cache[x] = False
2729 self._cache[x] = False
2729 return False
2730 return False
2730
2731
2731 class spanset(_orderedsetmixin):
2732 class spanset(_orderedsetmixin):
2732 """Duck type for baseset class which represents a range of revisions and
2733 """Duck type for baseset class which represents a range of revisions and
2733 can work lazily and without having all the range in memory
2734 can work lazily and without having all the range in memory
2734
2735
2735 Note that spanset(x, y) behave almost like xrange(x, y) except for two
2736 Note that spanset(x, y) behave almost like xrange(x, y) except for two
2736 notable points:
2737 notable points:
2737 - when x < y it will be automatically descending,
2738 - when x < y it will be automatically descending,
2738 - revision filtered with this repoview will be skipped.
2739 - revision filtered with this repoview will be skipped.
2739
2740
2740 """
2741 """
2741 def __init__(self, repo, start=0, end=None):
2742 def __init__(self, repo, start=0, end=None):
2742 """
2743 """
2743 start: first revision included the set
2744 start: first revision included the set
2744 (default to 0)
2745 (default to 0)
2745 end: first revision excluded (last+1)
2746 end: first revision excluded (last+1)
2746 (default to len(repo)
2747 (default to len(repo)
2747
2748
2748 Spanset will be descending if `end` < `start`.
2749 Spanset will be descending if `end` < `start`.
2749 """
2750 """
2750 self._start = start
2751 self._start = start
2751 if end is not None:
2752 if end is not None:
2752 self._end = end
2753 self._end = end
2753 else:
2754 else:
2754 self._end = len(repo)
2755 self._end = len(repo)
2755 self._hiddenrevs = repo.changelog.filteredrevs
2756 self._hiddenrevs = repo.changelog.filteredrevs
2756
2757
2757 def ascending(self):
2758 def ascending(self):
2758 if not self.isascending():
2759 if not self.isascending():
2759 self.reverse()
2760 self.reverse()
2760
2761
2761 def descending(self):
2762 def descending(self):
2762 if not self.isdescending():
2763 if not self.isdescending():
2763 self.reverse()
2764 self.reverse()
2764
2765
2765 def __iter__(self):
2766 def __iter__(self):
2766 if self.isascending():
2767 if self.isascending():
2767 iterrange = xrange(self._start, self._end)
2768 iterrange = xrange(self._start, self._end)
2768 else:
2769 else:
2769 iterrange = xrange(self._start, self._end, -1)
2770 iterrange = xrange(self._start, self._end, -1)
2770
2771
2771 if self._hiddenrevs:
2772 if self._hiddenrevs:
2772 s = self._hiddenrevs
2773 s = self._hiddenrevs
2773 for r in iterrange:
2774 for r in iterrange:
2774 if r not in s:
2775 if r not in s:
2775 yield r
2776 yield r
2776 else:
2777 else:
2777 for r in iterrange:
2778 for r in iterrange:
2778 yield r
2779 yield r
2779
2780
2780 def __contains__(self, rev):
2781 def __contains__(self, rev):
2781 return (((self._end < rev <= self._start)
2782 return (((self._end < rev <= self._start)
2782 or (self._start <= rev < self._end))
2783 or (self._start <= rev < self._end))
2783 and not (self._hiddenrevs and rev in self._hiddenrevs))
2784 and not (self._hiddenrevs and rev in self._hiddenrevs))
2784
2785
2785 def __nonzero__(self):
2786 def __nonzero__(self):
2786 for r in self:
2787 for r in self:
2787 return True
2788 return True
2788 return False
2789 return False
2789
2790
2790 def __and__(self, x):
2791 def __and__(self, x):
2791 if isinstance(x, baseset):
2792 if isinstance(x, baseset):
2792 x = x.set()
2793 x = x.set()
2793 return orderedlazyset(self, x.__contains__,
2794 return orderedlazyset(self, x.__contains__,
2794 ascending=self.isascending())
2795 ascending=self.isascending())
2795
2796
2796 def __sub__(self, x):
2797 def __sub__(self, x):
2797 if isinstance(x, baseset):
2798 if isinstance(x, baseset):
2798 x = x.set()
2799 x = x.set()
2799 return orderedlazyset(self, lambda r: r not in x,
2800 return orderedlazyset(self, lambda r: r not in x,
2800 ascending=self.isascending())
2801 ascending=self.isascending())
2801
2802
2802 def __add__(self, x):
2803 def __add__(self, x):
2803 kwargs = {}
2804 kwargs = {}
2804 if self.isascending() and x.isascending():
2805 if self.isascending() and x.isascending():
2805 kwargs['ascending'] = True
2806 kwargs['ascending'] = True
2806 if self.isdescending() and x.isdescending():
2807 if self.isdescending() and x.isdescending():
2807 kwargs['ascending'] = False
2808 kwargs['ascending'] = False
2808 return _addset(self, x, **kwargs)
2809 return _addset(self, x, **kwargs)
2809
2810
2810 def __len__(self):
2811 def __len__(self):
2811 if not self._hiddenrevs:
2812 if not self._hiddenrevs:
2812 return abs(self._end - self._start)
2813 return abs(self._end - self._start)
2813 else:
2814 else:
2814 count = 0
2815 count = 0
2815 start = self._start
2816 start = self._start
2816 end = self._end
2817 end = self._end
2817 for rev in self._hiddenrevs:
2818 for rev in self._hiddenrevs:
2818 if (end < rev <= start) or (start <= rev < end):
2819 if (end < rev <= start) or (start <= rev < end):
2819 count += 1
2820 count += 1
2820 return abs(self._end - self._start) - count
2821 return abs(self._end - self._start) - count
2821
2822
2822 def __getitem__(self, x):
2823 def __getitem__(self, x):
2823 # Basic implementation to be changed in future patches.
2824 # Basic implementation to be changed in future patches.
2824 l = baseset([r for r in self])
2825 l = baseset([r for r in self])
2825 return l[x]
2826 return l[x]
2826
2827
2827 def sort(self, reverse=False):
2828 def sort(self, reverse=False):
2828 if bool(reverse) != (self._start > self._end):
2829 if bool(reverse) != (self._start > self._end):
2829 self.reverse()
2830 self.reverse()
2830
2831
2831 def reverse(self):
2832 def reverse(self):
2832 # Just switch the _start and _end parameters
2833 # Just switch the _start and _end parameters
2833 if self.isascending():
2834 if self.isascending():
2834 self._start, self._end = self._end - 1, self._start - 1
2835 self._start, self._end = self._end - 1, self._start - 1
2835 else:
2836 else:
2836 self._start, self._end = self._end + 1, self._start + 1
2837 self._start, self._end = self._end + 1, self._start + 1
2837
2838
2838 def set(self):
2839 def set(self):
2839 return self
2840 return self
2840
2841
2841 def isascending(self):
2842 def isascending(self):
2842 return self._start <= self._end
2843 return self._start <= self._end
2843
2844
2844 def isdescending(self):
2845 def isdescending(self):
2845 return self._start >= self._end
2846 return self._start >= self._end
2846
2847
2847 def filter(self, l):
2848 def filter(self, l):
2848 return orderedlazyset(self, l, ascending=self.isascending())
2849 return orderedlazyset(self, l, ascending=self.isascending())
2849
2850
2850 # tell hggettext to extract docstrings from these functions:
2851 # tell hggettext to extract docstrings from these functions:
2851 i18nfunctions = symbols.values()
2852 i18nfunctions = symbols.values()
General Comments 0
You need to be logged in to leave comments. Login now