Show More
@@ -1,542 +1,542 b'' | |||||
1 | # parser.py - simple top-down operator precedence parser for mercurial |
|
1 | # parser.py - simple top-down operator precedence parser 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 | # see http://effbot.org/zone/simple-top-down-parsing.htm and |
|
8 | # see http://effbot.org/zone/simple-top-down-parsing.htm and | |
9 | # http://eli.thegreenplace.net/2010/01/02/top-down-operator-precedence-parsing/ |
|
9 | # http://eli.thegreenplace.net/2010/01/02/top-down-operator-precedence-parsing/ | |
10 | # for background |
|
10 | # for background | |
11 |
|
11 | |||
12 | # takes a tokenizer and elements |
|
12 | # takes a tokenizer and elements | |
13 | # tokenizer is an iterator that returns (type, value, pos) tuples |
|
13 | # tokenizer is an iterator that returns (type, value, pos) tuples | |
14 | # elements is a mapping of types to binding strength, primary, prefix, infix |
|
14 | # elements is a mapping of types to binding strength, primary, prefix, infix | |
15 | # and suffix actions |
|
15 | # and suffix actions | |
16 | # an action is a tree node name, a tree label, and an optional match |
|
16 | # an action is a tree node name, a tree label, and an optional match | |
17 | # __call__(program) parses program into a labeled tree |
|
17 | # __call__(program) parses program into a labeled tree | |
18 |
|
18 | |||
19 | from __future__ import absolute_import |
|
19 | from __future__ import absolute_import | |
20 |
|
20 | |||
21 | from .i18n import _ |
|
21 | from .i18n import _ | |
22 | from . import error |
|
22 | from . import error | |
23 |
|
23 | |||
24 | class parser(object): |
|
24 | class parser(object): | |
25 | def __init__(self, elements, methods=None): |
|
25 | def __init__(self, elements, methods=None): | |
26 | self._elements = elements |
|
26 | self._elements = elements | |
27 | self._methods = methods |
|
27 | self._methods = methods | |
28 | self.current = None |
|
28 | self.current = None | |
29 | def _advance(self): |
|
29 | def _advance(self): | |
30 | 'advance the tokenizer' |
|
30 | 'advance the tokenizer' | |
31 | t = self.current |
|
31 | t = self.current | |
32 | self.current = next(self._iter, None) |
|
32 | self.current = next(self._iter, None) | |
33 | return t |
|
33 | return t | |
34 | def _hasnewterm(self): |
|
34 | def _hasnewterm(self): | |
35 | 'True if next token may start new term' |
|
35 | 'True if next token may start new term' | |
36 | return any(self._elements[self.current[0]][1:3]) |
|
36 | return any(self._elements[self.current[0]][1:3]) | |
37 | def _match(self, m): |
|
37 | def _match(self, m): | |
38 | 'make sure the tokenizer matches an end condition' |
|
38 | 'make sure the tokenizer matches an end condition' | |
39 | if self.current[0] != m: |
|
39 | if self.current[0] != m: | |
40 | raise error.ParseError(_("unexpected token: %s") % self.current[0], |
|
40 | raise error.ParseError(_("unexpected token: %s") % self.current[0], | |
41 | self.current[2]) |
|
41 | self.current[2]) | |
42 | self._advance() |
|
42 | self._advance() | |
43 | def _parseoperand(self, bind, m=None): |
|
43 | def _parseoperand(self, bind, m=None): | |
44 | 'gather right-hand-side operand until an end condition or binding met' |
|
44 | 'gather right-hand-side operand until an end condition or binding met' | |
45 | if m and self.current[0] == m: |
|
45 | if m and self.current[0] == m: | |
46 | expr = None |
|
46 | expr = None | |
47 | else: |
|
47 | else: | |
48 | expr = self._parse(bind) |
|
48 | expr = self._parse(bind) | |
49 | if m: |
|
49 | if m: | |
50 | self._match(m) |
|
50 | self._match(m) | |
51 | return expr |
|
51 | return expr | |
52 | def _parse(self, bind=0): |
|
52 | def _parse(self, bind=0): | |
53 | token, value, pos = self._advance() |
|
53 | token, value, pos = self._advance() | |
54 | # handle prefix rules on current token, take as primary if unambiguous |
|
54 | # handle prefix rules on current token, take as primary if unambiguous | |
55 | primary, prefix = self._elements[token][1:3] |
|
55 | primary, prefix = self._elements[token][1:3] | |
56 | if primary and not (prefix and self._hasnewterm()): |
|
56 | if primary and not (prefix and self._hasnewterm()): | |
57 | expr = (primary, value) |
|
57 | expr = (primary, value) | |
58 | elif prefix: |
|
58 | elif prefix: | |
59 | expr = (prefix[0], self._parseoperand(*prefix[1:])) |
|
59 | expr = (prefix[0], self._parseoperand(*prefix[1:])) | |
60 | else: |
|
60 | else: | |
61 | raise error.ParseError(_("not a prefix: %s") % token, pos) |
|
61 | raise error.ParseError(_("not a prefix: %s") % token, pos) | |
62 | # gather tokens until we meet a lower binding strength |
|
62 | # gather tokens until we meet a lower binding strength | |
63 | while bind < self._elements[self.current[0]][0]: |
|
63 | while bind < self._elements[self.current[0]][0]: | |
64 | token, value, pos = self._advance() |
|
64 | token, value, pos = self._advance() | |
65 | # handle infix rules, take as suffix if unambiguous |
|
65 | # handle infix rules, take as suffix if unambiguous | |
66 | infix, suffix = self._elements[token][3:] |
|
66 | infix, suffix = self._elements[token][3:] | |
67 | if suffix and not (infix and self._hasnewterm()): |
|
67 | if suffix and not (infix and self._hasnewterm()): | |
68 | expr = (suffix[0], expr) |
|
68 | expr = (suffix[0], expr) | |
69 | elif infix: |
|
69 | elif infix: | |
70 | expr = (infix[0], expr, self._parseoperand(*infix[1:])) |
|
70 | expr = (infix[0], expr, self._parseoperand(*infix[1:])) | |
71 | else: |
|
71 | else: | |
72 | raise error.ParseError(_("not an infix: %s") % token, pos) |
|
72 | raise error.ParseError(_("not an infix: %s") % token, pos) | |
73 | return expr |
|
73 | return expr | |
74 | def parse(self, tokeniter): |
|
74 | def parse(self, tokeniter): | |
75 | 'generate a parse tree from tokens' |
|
75 | 'generate a parse tree from tokens' | |
76 | self._iter = tokeniter |
|
76 | self._iter = tokeniter | |
77 | self._advance() |
|
77 | self._advance() | |
78 | res = self._parse() |
|
78 | res = self._parse() | |
79 | token, value, pos = self.current |
|
79 | token, value, pos = self.current | |
80 | return res, pos |
|
80 | return res, pos | |
81 | def eval(self, tree): |
|
81 | def eval(self, tree): | |
82 | 'recursively evaluate a parse tree using node methods' |
|
82 | 'recursively evaluate a parse tree using node methods' | |
83 | if not isinstance(tree, tuple): |
|
83 | if not isinstance(tree, tuple): | |
84 | return tree |
|
84 | return tree | |
85 | return self._methods[tree[0]](*[self.eval(t) for t in tree[1:]]) |
|
85 | return self._methods[tree[0]](*[self.eval(t) for t in tree[1:]]) | |
86 | def __call__(self, tokeniter): |
|
86 | def __call__(self, tokeniter): | |
87 | 'parse tokens into a parse tree and evaluate if methods given' |
|
87 | 'parse tokens into a parse tree and evaluate if methods given' | |
88 | t = self.parse(tokeniter) |
|
88 | t = self.parse(tokeniter) | |
89 | if self._methods: |
|
89 | if self._methods: | |
90 | return self.eval(t) |
|
90 | return self.eval(t) | |
91 | return t |
|
91 | return t | |
92 |
|
92 | |||
93 | def buildargsdict(trees, funcname, keys, keyvaluenode, keynode): |
|
93 | def buildargsdict(trees, funcname, keys, keyvaluenode, keynode): | |
94 | """Build dict from list containing positional and keyword arguments |
|
94 | """Build dict from list containing positional and keyword arguments | |
95 |
|
95 | |||
96 | Invalid keywords or too many positional arguments are rejected, but |
|
96 | Invalid keywords or too many positional arguments are rejected, but | |
97 | missing arguments are just omitted. |
|
97 | missing arguments are just omitted. | |
98 | """ |
|
98 | """ | |
99 | if len(trees) > len(keys): |
|
99 | if len(trees) > len(keys): | |
100 | raise error.ParseError(_("%(func)s takes at most %(nargs)d arguments") |
|
100 | raise error.ParseError(_("%(func)s takes at most %(nargs)d arguments") | |
101 | % {'func': funcname, 'nargs': len(keys)}) |
|
101 | % {'func': funcname, 'nargs': len(keys)}) | |
102 | args = {} |
|
102 | args = {} | |
103 | # consume positional arguments |
|
103 | # consume positional arguments | |
104 | for k, x in zip(keys, trees): |
|
104 | for k, x in zip(keys, trees): | |
105 | if x[0] == keyvaluenode: |
|
105 | if x[0] == keyvaluenode: | |
106 | break |
|
106 | break | |
107 | args[k] = x |
|
107 | args[k] = x | |
108 | # remainder should be keyword arguments |
|
108 | # remainder should be keyword arguments | |
109 | for x in trees[len(args):]: |
|
109 | for x in trees[len(args):]: | |
110 | if x[0] != keyvaluenode or x[1][0] != keynode: |
|
110 | if x[0] != keyvaluenode or x[1][0] != keynode: | |
111 | raise error.ParseError(_("%(func)s got an invalid argument") |
|
111 | raise error.ParseError(_("%(func)s got an invalid argument") | |
112 | % {'func': funcname}) |
|
112 | % {'func': funcname}) | |
113 | k = x[1][1] |
|
113 | k = x[1][1] | |
114 | if k not in keys: |
|
114 | if k not in keys: | |
115 | raise error.ParseError(_("%(func)s got an unexpected keyword " |
|
115 | raise error.ParseError(_("%(func)s got an unexpected keyword " | |
116 | "argument '%(key)s'") |
|
116 | "argument '%(key)s'") | |
117 | % {'func': funcname, 'key': k}) |
|
117 | % {'func': funcname, 'key': k}) | |
118 | if k in args: |
|
118 | if k in args: | |
119 | raise error.ParseError(_("%(func)s got multiple values for keyword " |
|
119 | raise error.ParseError(_("%(func)s got multiple values for keyword " | |
120 | "argument '%(key)s'") |
|
120 | "argument '%(key)s'") | |
121 | % {'func': funcname, 'key': k}) |
|
121 | % {'func': funcname, 'key': k}) | |
122 | args[k] = x[2] |
|
122 | args[k] = x[2] | |
123 | return args |
|
123 | return args | |
124 |
|
124 | |||
125 | def unescapestr(s): |
|
125 | def unescapestr(s): | |
126 | try: |
|
126 | try: | |
127 | return s.decode("string_escape") |
|
127 | return s.decode("string_escape") | |
128 | except ValueError as e: |
|
128 | except ValueError as e: | |
129 | # mangle Python's exception into our format |
|
129 | # mangle Python's exception into our format | |
130 | raise error.ParseError(str(e).lower()) |
|
130 | raise error.ParseError(str(e).lower()) | |
131 |
|
131 | |||
132 | def _prettyformat(tree, leafnodes, level, lines): |
|
132 | def _prettyformat(tree, leafnodes, level, lines): | |
133 | if not isinstance(tree, tuple) or tree[0] in leafnodes: |
|
133 | if not isinstance(tree, tuple) or tree[0] in leafnodes: | |
134 | lines.append((level, str(tree))) |
|
134 | lines.append((level, str(tree))) | |
135 | else: |
|
135 | else: | |
136 | lines.append((level, '(%s' % tree[0])) |
|
136 | lines.append((level, '(%s' % tree[0])) | |
137 | for s in tree[1:]: |
|
137 | for s in tree[1:]: | |
138 | _prettyformat(s, leafnodes, level + 1, lines) |
|
138 | _prettyformat(s, leafnodes, level + 1, lines) | |
139 | lines[-1:] = [(lines[-1][0], lines[-1][1] + ')')] |
|
139 | lines[-1:] = [(lines[-1][0], lines[-1][1] + ')')] | |
140 |
|
140 | |||
141 | def prettyformat(tree, leafnodes): |
|
141 | def prettyformat(tree, leafnodes): | |
142 | lines = [] |
|
142 | lines = [] | |
143 | _prettyformat(tree, leafnodes, 0, lines) |
|
143 | _prettyformat(tree, leafnodes, 0, lines) | |
144 | output = '\n'.join((' ' * l + s) for l, s in lines) |
|
144 | output = '\n'.join((' ' * l + s) for l, s in lines) | |
145 | return output |
|
145 | return output | |
146 |
|
146 | |||
147 | def simplifyinfixops(tree, targetnodes): |
|
147 | def simplifyinfixops(tree, targetnodes): | |
148 | """Flatten chained infix operations to reduce usage of Python stack |
|
148 | """Flatten chained infix operations to reduce usage of Python stack | |
149 |
|
149 | |||
150 | >>> def f(tree): |
|
150 | >>> def f(tree): | |
151 | ... print prettyformat(simplifyinfixops(tree, ('or',)), ('symbol',)) |
|
151 | ... print prettyformat(simplifyinfixops(tree, ('or',)), ('symbol',)) | |
152 | >>> f(('or', |
|
152 | >>> f(('or', | |
153 | ... ('or', |
|
153 | ... ('or', | |
154 | ... ('symbol', '1'), |
|
154 | ... ('symbol', '1'), | |
155 | ... ('symbol', '2')), |
|
155 | ... ('symbol', '2')), | |
156 | ... ('symbol', '3'))) |
|
156 | ... ('symbol', '3'))) | |
157 | (or |
|
157 | (or | |
158 | ('symbol', '1') |
|
158 | ('symbol', '1') | |
159 | ('symbol', '2') |
|
159 | ('symbol', '2') | |
160 | ('symbol', '3')) |
|
160 | ('symbol', '3')) | |
161 | >>> f(('func', |
|
161 | >>> f(('func', | |
162 | ... ('symbol', 'p1'), |
|
162 | ... ('symbol', 'p1'), | |
163 | ... ('or', |
|
163 | ... ('or', | |
164 | ... ('or', |
|
164 | ... ('or', | |
165 | ... ('func', |
|
165 | ... ('func', | |
166 | ... ('symbol', 'sort'), |
|
166 | ... ('symbol', 'sort'), | |
167 | ... ('list', |
|
167 | ... ('list', | |
168 | ... ('or', |
|
168 | ... ('or', | |
169 | ... ('or', |
|
169 | ... ('or', | |
170 | ... ('symbol', '1'), |
|
170 | ... ('symbol', '1'), | |
171 | ... ('symbol', '2')), |
|
171 | ... ('symbol', '2')), | |
172 | ... ('symbol', '3')), |
|
172 | ... ('symbol', '3')), | |
173 | ... ('negate', |
|
173 | ... ('negate', | |
174 | ... ('symbol', 'rev')))), |
|
174 | ... ('symbol', 'rev')))), | |
175 | ... ('and', |
|
175 | ... ('and', | |
176 | ... ('symbol', '4'), |
|
176 | ... ('symbol', '4'), | |
177 | ... ('group', |
|
177 | ... ('group', | |
178 | ... ('or', |
|
178 | ... ('or', | |
179 | ... ('or', |
|
179 | ... ('or', | |
180 | ... ('symbol', '5'), |
|
180 | ... ('symbol', '5'), | |
181 | ... ('symbol', '6')), |
|
181 | ... ('symbol', '6')), | |
182 | ... ('symbol', '7'))))), |
|
182 | ... ('symbol', '7'))))), | |
183 | ... ('symbol', '8')))) |
|
183 | ... ('symbol', '8')))) | |
184 | (func |
|
184 | (func | |
185 | ('symbol', 'p1') |
|
185 | ('symbol', 'p1') | |
186 | (or |
|
186 | (or | |
187 | (func |
|
187 | (func | |
188 | ('symbol', 'sort') |
|
188 | ('symbol', 'sort') | |
189 | (list |
|
189 | (list | |
190 | (or |
|
190 | (or | |
191 | ('symbol', '1') |
|
191 | ('symbol', '1') | |
192 | ('symbol', '2') |
|
192 | ('symbol', '2') | |
193 | ('symbol', '3')) |
|
193 | ('symbol', '3')) | |
194 | (negate |
|
194 | (negate | |
195 | ('symbol', 'rev')))) |
|
195 | ('symbol', 'rev')))) | |
196 | (and |
|
196 | (and | |
197 | ('symbol', '4') |
|
197 | ('symbol', '4') | |
198 | (group |
|
198 | (group | |
199 | (or |
|
199 | (or | |
200 | ('symbol', '5') |
|
200 | ('symbol', '5') | |
201 | ('symbol', '6') |
|
201 | ('symbol', '6') | |
202 | ('symbol', '7')))) |
|
202 | ('symbol', '7')))) | |
203 | ('symbol', '8'))) |
|
203 | ('symbol', '8'))) | |
204 | """ |
|
204 | """ | |
205 | if not isinstance(tree, tuple): |
|
205 | if not isinstance(tree, tuple): | |
206 | return tree |
|
206 | return tree | |
207 | op = tree[0] |
|
207 | op = tree[0] | |
208 | if op not in targetnodes: |
|
208 | if op not in targetnodes: | |
209 | return (op,) + tuple(simplifyinfixops(x, targetnodes) for x in tree[1:]) |
|
209 | return (op,) + tuple(simplifyinfixops(x, targetnodes) for x in tree[1:]) | |
210 |
|
210 | |||
211 | # walk down left nodes taking each right node. no recursion to left nodes |
|
211 | # walk down left nodes taking each right node. no recursion to left nodes | |
212 | # because infix operators are left-associative, i.e. left tree is deep. |
|
212 | # because infix operators are left-associative, i.e. left tree is deep. | |
213 | # e.g. '1 + 2 + 3' -> (+ (+ 1 2) 3) -> (+ 1 2 3) |
|
213 | # e.g. '1 + 2 + 3' -> (+ (+ 1 2) 3) -> (+ 1 2 3) | |
214 | simplified = [] |
|
214 | simplified = [] | |
215 | x = tree |
|
215 | x = tree | |
216 | while x[0] == op: |
|
216 | while x[0] == op: | |
217 | l, r = x[1:] |
|
217 | l, r = x[1:] | |
218 | simplified.append(simplifyinfixops(r, targetnodes)) |
|
218 | simplified.append(simplifyinfixops(r, targetnodes)) | |
219 | x = l |
|
219 | x = l | |
220 | simplified.append(simplifyinfixops(x, targetnodes)) |
|
220 | simplified.append(simplifyinfixops(x, targetnodes)) | |
221 | simplified.append(op) |
|
221 | simplified.append(op) | |
222 | return tuple(reversed(simplified)) |
|
222 | return tuple(reversed(simplified)) | |
223 |
|
223 | |||
224 | def parseerrordetail(inst): |
|
224 | def parseerrordetail(inst): | |
225 | """Compose error message from specified ParseError object |
|
225 | """Compose error message from specified ParseError object | |
226 | """ |
|
226 | """ | |
227 | if len(inst.args) > 1: |
|
227 | if len(inst.args) > 1: | |
228 | return _('at %s: %s') % (inst.args[1], inst.args[0]) |
|
228 | return _('at %s: %s') % (inst.args[1], inst.args[0]) | |
229 | else: |
|
229 | else: | |
230 | return inst.args[0] |
|
230 | return inst.args[0] | |
231 |
|
231 | |||
232 | class alias(object): |
|
232 | class alias(object): | |
233 | """Parsed result of alias""" |
|
233 | """Parsed result of alias""" | |
234 |
|
234 | |||
235 | def __init__(self, name, args, err, replacement): |
|
235 | def __init__(self, name, args, err, replacement): | |
236 | self.name = name |
|
236 | self.name = name | |
237 | self.args = args |
|
237 | self.args = args | |
238 | self.error = err |
|
238 | self.error = err | |
239 | self.replacement = replacement |
|
239 | self.replacement = replacement | |
240 | # whether own `error` information is already shown or not. |
|
240 | # whether own `error` information is already shown or not. | |
241 | # this avoids showing same warning multiple times at each |
|
241 | # this avoids showing same warning multiple times at each | |
242 | # `expandaliases`. |
|
242 | # `expandaliases`. | |
243 | self.warned = False |
|
243 | self.warned = False | |
244 |
|
244 | |||
245 | class basealiasrules(object): |
|
245 | class basealiasrules(object): | |
246 | """Parsing and expansion rule set of aliases |
|
246 | """Parsing and expansion rule set of aliases | |
247 |
|
247 | |||
248 | This is a helper for fileset/revset/template aliases. A concrete rule set |
|
248 | This is a helper for fileset/revset/template aliases. A concrete rule set | |
249 | should be made by sub-classing this and implementing class/static methods. |
|
249 | should be made by sub-classing this and implementing class/static methods. | |
250 |
|
250 | |||
251 | It supports alias expansion of symbol and funciton-call styles:: |
|
251 | It supports alias expansion of symbol and funciton-call styles:: | |
252 |
|
252 | |||
253 | # decl = defn |
|
253 | # decl = defn | |
254 | h = heads(default) |
|
254 | h = heads(default) | |
255 | b($1) = ancestors($1) - ancestors(default) |
|
255 | b($1) = ancestors($1) - ancestors(default) | |
256 | """ |
|
256 | """ | |
257 | # typically a config section, which will be included in error messages |
|
257 | # typically a config section, which will be included in error messages | |
258 | _section = None |
|
258 | _section = None | |
259 | # tag of symbol node |
|
259 | # tag of symbol node | |
260 | _symbolnode = 'symbol' |
|
260 | _symbolnode = 'symbol' | |
261 |
|
261 | |||
262 | def __new__(cls): |
|
262 | def __new__(cls): | |
263 | raise TypeError("'%s' is not instantiatable" % cls.__name__) |
|
263 | raise TypeError("'%s' is not instantiatable" % cls.__name__) | |
264 |
|
264 | |||
265 | @staticmethod |
|
265 | @staticmethod | |
266 | def _parse(spec): |
|
266 | def _parse(spec): | |
267 | """Parse an alias name, arguments and definition""" |
|
267 | """Parse an alias name, arguments and definition""" | |
268 | raise NotImplementedError |
|
268 | raise NotImplementedError | |
269 |
|
269 | |||
270 | @staticmethod |
|
270 | @staticmethod | |
271 | def _trygetfunc(tree): |
|
271 | def _trygetfunc(tree): | |
272 | """Return (name, args) if tree is a function; otherwise None""" |
|
272 | """Return (name, args) if tree is a function; otherwise None""" | |
273 | raise NotImplementedError |
|
273 | raise NotImplementedError | |
274 |
|
274 | |||
275 | @classmethod |
|
275 | @classmethod | |
276 | def _builddecl(cls, decl): |
|
276 | def _builddecl(cls, decl): | |
277 | """Parse an alias declaration into ``(name, args, errorstr)`` |
|
277 | """Parse an alias declaration into ``(name, args, errorstr)`` | |
278 |
|
278 | |||
279 | This function analyzes the parsed tree. The parsing rule is provided |
|
279 | This function analyzes the parsed tree. The parsing rule is provided | |
280 | by ``_parse()``. |
|
280 | by ``_parse()``. | |
281 |
|
281 | |||
282 | - ``name``: of declared alias (may be ``decl`` itself at error) |
|
282 | - ``name``: of declared alias (may be ``decl`` itself at error) | |
283 | - ``args``: list of argument names (or None for symbol declaration) |
|
283 | - ``args``: list of argument names (or None for symbol declaration) | |
284 | - ``errorstr``: detail about detected error (or None) |
|
284 | - ``errorstr``: detail about detected error (or None) | |
285 |
|
285 | |||
286 | >>> sym = lambda x: ('symbol', x) |
|
286 | >>> sym = lambda x: ('symbol', x) | |
287 | >>> symlist = lambda *xs: ('list',) + tuple(sym(x) for x in xs) |
|
287 | >>> symlist = lambda *xs: ('list',) + tuple(sym(x) for x in xs) | |
288 | >>> func = lambda n, a: ('func', sym(n), a) |
|
288 | >>> func = lambda n, a: ('func', sym(n), a) | |
289 | >>> parsemap = { |
|
289 | >>> parsemap = { | |
290 | ... 'foo': sym('foo'), |
|
290 | ... 'foo': sym('foo'), | |
291 | ... '$foo': sym('$foo'), |
|
291 | ... '$foo': sym('$foo'), | |
292 | ... 'foo::bar': ('dagrange', sym('foo'), sym('bar')), |
|
292 | ... 'foo::bar': ('dagrange', sym('foo'), sym('bar')), | |
293 | ... 'foo()': func('foo', None), |
|
293 | ... 'foo()': func('foo', None), | |
294 | ... '$foo()': func('$foo', None), |
|
294 | ... '$foo()': func('$foo', None), | |
295 | ... 'foo($1, $2)': func('foo', symlist('$1', '$2')), |
|
295 | ... 'foo($1, $2)': func('foo', symlist('$1', '$2')), | |
296 | ... 'foo(bar_bar, baz.baz)': |
|
296 | ... 'foo(bar_bar, baz.baz)': | |
297 | ... func('foo', symlist('bar_bar', 'baz.baz')), |
|
297 | ... func('foo', symlist('bar_bar', 'baz.baz')), | |
298 | ... 'foo(bar($1, $2))': |
|
298 | ... 'foo(bar($1, $2))': | |
299 | ... func('foo', func('bar', symlist('$1', '$2'))), |
|
299 | ... func('foo', func('bar', symlist('$1', '$2'))), | |
300 | ... 'foo($1, $2, nested($1, $2))': |
|
300 | ... 'foo($1, $2, nested($1, $2))': | |
301 | ... func('foo', (symlist('$1', '$2') + |
|
301 | ... func('foo', (symlist('$1', '$2') + | |
302 | ... (func('nested', symlist('$1', '$2')),))), |
|
302 | ... (func('nested', symlist('$1', '$2')),))), | |
303 | ... 'foo("bar")': func('foo', ('string', 'bar')), |
|
303 | ... 'foo("bar")': func('foo', ('string', 'bar')), | |
304 | ... 'foo($1, $2': error.ParseError('unexpected token: end', 10), |
|
304 | ... 'foo($1, $2': error.ParseError('unexpected token: end', 10), | |
305 | ... 'foo("bar': error.ParseError('unterminated string', 5), |
|
305 | ... 'foo("bar': error.ParseError('unterminated string', 5), | |
306 | ... 'foo($1, $2, $1)': func('foo', symlist('$1', '$2', '$1')), |
|
306 | ... 'foo($1, $2, $1)': func('foo', symlist('$1', '$2', '$1')), | |
307 | ... } |
|
307 | ... } | |
308 | >>> def parse(expr): |
|
308 | >>> def parse(expr): | |
309 | ... x = parsemap[expr] |
|
309 | ... x = parsemap[expr] | |
310 | ... if isinstance(x, Exception): |
|
310 | ... if isinstance(x, Exception): | |
311 | ... raise x |
|
311 | ... raise x | |
312 | ... return x |
|
312 | ... return x | |
313 | >>> def trygetfunc(tree): |
|
313 | >>> def trygetfunc(tree): | |
314 | ... if not tree or tree[0] != 'func' or tree[1][0] != 'symbol': |
|
314 | ... if not tree or tree[0] != 'func' or tree[1][0] != 'symbol': | |
315 | ... return None |
|
315 | ... return None | |
316 | ... if not tree[2]: |
|
316 | ... if not tree[2]: | |
317 | ... return tree[1][1], [] |
|
317 | ... return tree[1][1], [] | |
318 | ... if tree[2][0] == 'list': |
|
318 | ... if tree[2][0] == 'list': | |
319 | ... return tree[1][1], list(tree[2][1:]) |
|
319 | ... return tree[1][1], list(tree[2][1:]) | |
320 | ... return tree[1][1], [tree[2]] |
|
320 | ... return tree[1][1], [tree[2]] | |
321 | >>> class aliasrules(basealiasrules): |
|
321 | >>> class aliasrules(basealiasrules): | |
322 | ... _parse = staticmethod(parse) |
|
322 | ... _parse = staticmethod(parse) | |
323 | ... _trygetfunc = staticmethod(trygetfunc) |
|
323 | ... _trygetfunc = staticmethod(trygetfunc) | |
324 | >>> builddecl = aliasrules._builddecl |
|
324 | >>> builddecl = aliasrules._builddecl | |
325 | >>> builddecl('foo') |
|
325 | >>> builddecl('foo') | |
326 | ('foo', None, None) |
|
326 | ('foo', None, None) | |
327 | >>> builddecl('$foo') |
|
327 | >>> builddecl('$foo') | |
328 |
('$foo', None, " |
|
328 | ('$foo', None, "invalid symbol '$foo'") | |
329 | >>> builddecl('foo::bar') |
|
329 | >>> builddecl('foo::bar') | |
330 | ('foo::bar', None, 'invalid format') |
|
330 | ('foo::bar', None, 'invalid format') | |
331 | >>> builddecl('foo()') |
|
331 | >>> builddecl('foo()') | |
332 | ('foo', [], None) |
|
332 | ('foo', [], None) | |
333 | >>> builddecl('$foo()') |
|
333 | >>> builddecl('$foo()') | |
334 |
('$foo()', None, " |
|
334 | ('$foo()', None, "invalid function '$foo'") | |
335 | >>> builddecl('foo($1, $2)') |
|
335 | >>> builddecl('foo($1, $2)') | |
336 | ('foo', ['$1', '$2'], None) |
|
336 | ('foo', ['$1', '$2'], None) | |
337 | >>> builddecl('foo(bar_bar, baz.baz)') |
|
337 | >>> builddecl('foo(bar_bar, baz.baz)') | |
338 | ('foo', ['bar_bar', 'baz.baz'], None) |
|
338 | ('foo', ['bar_bar', 'baz.baz'], None) | |
339 | >>> builddecl('foo($1, $2, nested($1, $2))') |
|
339 | >>> builddecl('foo($1, $2, nested($1, $2))') | |
340 | ('foo($1, $2, nested($1, $2))', None, 'invalid argument list') |
|
340 | ('foo($1, $2, nested($1, $2))', None, 'invalid argument list') | |
341 | >>> builddecl('foo(bar($1, $2))') |
|
341 | >>> builddecl('foo(bar($1, $2))') | |
342 | ('foo(bar($1, $2))', None, 'invalid argument list') |
|
342 | ('foo(bar($1, $2))', None, 'invalid argument list') | |
343 | >>> builddecl('foo("bar")') |
|
343 | >>> builddecl('foo("bar")') | |
344 | ('foo("bar")', None, 'invalid argument list') |
|
344 | ('foo("bar")', None, 'invalid argument list') | |
345 | >>> builddecl('foo($1, $2') |
|
345 | >>> builddecl('foo($1, $2') | |
346 | ('foo($1, $2', None, 'at 10: unexpected token: end') |
|
346 | ('foo($1, $2', None, 'at 10: unexpected token: end') | |
347 | >>> builddecl('foo("bar') |
|
347 | >>> builddecl('foo("bar') | |
348 | ('foo("bar', None, 'at 5: unterminated string') |
|
348 | ('foo("bar', None, 'at 5: unterminated string') | |
349 | >>> builddecl('foo($1, $2, $1)') |
|
349 | >>> builddecl('foo($1, $2, $1)') | |
350 | ('foo', None, 'argument names collide with each other') |
|
350 | ('foo', None, 'argument names collide with each other') | |
351 | """ |
|
351 | """ | |
352 | try: |
|
352 | try: | |
353 | tree = cls._parse(decl) |
|
353 | tree = cls._parse(decl) | |
354 | except error.ParseError as inst: |
|
354 | except error.ParseError as inst: | |
355 | return (decl, None, parseerrordetail(inst)) |
|
355 | return (decl, None, parseerrordetail(inst)) | |
356 |
|
356 | |||
357 | if tree[0] == cls._symbolnode: |
|
357 | if tree[0] == cls._symbolnode: | |
358 | # "name = ...." style |
|
358 | # "name = ...." style | |
359 | name = tree[1] |
|
359 | name = tree[1] | |
360 | if name.startswith('$'): |
|
360 | if name.startswith('$'): | |
361 |
return (decl, None, _("' |
|
361 | return (decl, None, _("invalid symbol '%s'") % name) | |
362 | return (name, None, None) |
|
362 | return (name, None, None) | |
363 |
|
363 | |||
364 | func = cls._trygetfunc(tree) |
|
364 | func = cls._trygetfunc(tree) | |
365 | if func: |
|
365 | if func: | |
366 | # "name(arg, ....) = ...." style |
|
366 | # "name(arg, ....) = ...." style | |
367 | name, args = func |
|
367 | name, args = func | |
368 | if name.startswith('$'): |
|
368 | if name.startswith('$'): | |
369 |
return (decl, None, _("' |
|
369 | return (decl, None, _("invalid function '%s'") % name) | |
370 | if any(t[0] != cls._symbolnode for t in args): |
|
370 | if any(t[0] != cls._symbolnode for t in args): | |
371 | return (decl, None, _("invalid argument list")) |
|
371 | return (decl, None, _("invalid argument list")) | |
372 | if len(args) != len(set(args)): |
|
372 | if len(args) != len(set(args)): | |
373 | return (name, None, _("argument names collide with each other")) |
|
373 | return (name, None, _("argument names collide with each other")) | |
374 | return (name, [t[1] for t in args], None) |
|
374 | return (name, [t[1] for t in args], None) | |
375 |
|
375 | |||
376 | return (decl, None, _("invalid format")) |
|
376 | return (decl, None, _("invalid format")) | |
377 |
|
377 | |||
378 | @classmethod |
|
378 | @classmethod | |
379 | def _relabelargs(cls, tree, args): |
|
379 | def _relabelargs(cls, tree, args): | |
380 | """Mark alias arguments as ``_aliasarg``""" |
|
380 | """Mark alias arguments as ``_aliasarg``""" | |
381 | if not isinstance(tree, tuple): |
|
381 | if not isinstance(tree, tuple): | |
382 | return tree |
|
382 | return tree | |
383 | op = tree[0] |
|
383 | op = tree[0] | |
384 | if op != cls._symbolnode: |
|
384 | if op != cls._symbolnode: | |
385 | return (op,) + tuple(cls._relabelargs(x, args) for x in tree[1:]) |
|
385 | return (op,) + tuple(cls._relabelargs(x, args) for x in tree[1:]) | |
386 |
|
386 | |||
387 | assert len(tree) == 2 |
|
387 | assert len(tree) == 2 | |
388 | sym = tree[1] |
|
388 | sym = tree[1] | |
389 | if sym in args: |
|
389 | if sym in args: | |
390 | op = '_aliasarg' |
|
390 | op = '_aliasarg' | |
391 | elif sym.startswith('$'): |
|
391 | elif sym.startswith('$'): | |
392 |
raise error.ParseError(_("' |
|
392 | raise error.ParseError(_("invalid symbol '%s'") % sym) | |
393 | return (op, sym) |
|
393 | return (op, sym) | |
394 |
|
394 | |||
395 | @classmethod |
|
395 | @classmethod | |
396 | def _builddefn(cls, defn, args): |
|
396 | def _builddefn(cls, defn, args): | |
397 | """Parse an alias definition into a tree and marks substitutions |
|
397 | """Parse an alias definition into a tree and marks substitutions | |
398 |
|
398 | |||
399 | This function marks alias argument references as ``_aliasarg``. The |
|
399 | This function marks alias argument references as ``_aliasarg``. The | |
400 | parsing rule is provided by ``_parse()``. |
|
400 | parsing rule is provided by ``_parse()``. | |
401 |
|
401 | |||
402 | ``args`` is a list of alias argument names, or None if the alias |
|
402 | ``args`` is a list of alias argument names, or None if the alias | |
403 | is declared as a symbol. |
|
403 | is declared as a symbol. | |
404 |
|
404 | |||
405 | >>> parsemap = { |
|
405 | >>> parsemap = { | |
406 | ... '$1 or foo': ('or', ('symbol', '$1'), ('symbol', 'foo')), |
|
406 | ... '$1 or foo': ('or', ('symbol', '$1'), ('symbol', 'foo')), | |
407 | ... '$1 or $bar': ('or', ('symbol', '$1'), ('symbol', '$bar')), |
|
407 | ... '$1 or $bar': ('or', ('symbol', '$1'), ('symbol', '$bar')), | |
408 | ... '$10 or baz': ('or', ('symbol', '$10'), ('symbol', 'baz')), |
|
408 | ... '$10 or baz': ('or', ('symbol', '$10'), ('symbol', 'baz')), | |
409 | ... '"$1" or "foo"': ('or', ('string', '$1'), ('string', 'foo')), |
|
409 | ... '"$1" or "foo"': ('or', ('string', '$1'), ('string', 'foo')), | |
410 | ... } |
|
410 | ... } | |
411 | >>> class aliasrules(basealiasrules): |
|
411 | >>> class aliasrules(basealiasrules): | |
412 | ... _parse = staticmethod(parsemap.__getitem__) |
|
412 | ... _parse = staticmethod(parsemap.__getitem__) | |
413 | ... _trygetfunc = staticmethod(lambda x: None) |
|
413 | ... _trygetfunc = staticmethod(lambda x: None) | |
414 | >>> builddefn = aliasrules._builddefn |
|
414 | >>> builddefn = aliasrules._builddefn | |
415 | >>> def pprint(tree): |
|
415 | >>> def pprint(tree): | |
416 | ... print prettyformat(tree, ('_aliasarg', 'string', 'symbol')) |
|
416 | ... print prettyformat(tree, ('_aliasarg', 'string', 'symbol')) | |
417 | >>> args = ['$1', '$2', 'foo'] |
|
417 | >>> args = ['$1', '$2', 'foo'] | |
418 | >>> pprint(builddefn('$1 or foo', args)) |
|
418 | >>> pprint(builddefn('$1 or foo', args)) | |
419 | (or |
|
419 | (or | |
420 | ('_aliasarg', '$1') |
|
420 | ('_aliasarg', '$1') | |
421 | ('_aliasarg', 'foo')) |
|
421 | ('_aliasarg', 'foo')) | |
422 | >>> try: |
|
422 | >>> try: | |
423 | ... builddefn('$1 or $bar', args) |
|
423 | ... builddefn('$1 or $bar', args) | |
424 | ... except error.ParseError as inst: |
|
424 | ... except error.ParseError as inst: | |
425 | ... print parseerrordetail(inst) |
|
425 | ... print parseerrordetail(inst) | |
426 | '$' not for alias arguments |
|
426 | invalid symbol '$bar' | |
427 | >>> args = ['$1', '$10', 'foo'] |
|
427 | >>> args = ['$1', '$10', 'foo'] | |
428 | >>> pprint(builddefn('$10 or baz', args)) |
|
428 | >>> pprint(builddefn('$10 or baz', args)) | |
429 | (or |
|
429 | (or | |
430 | ('_aliasarg', '$10') |
|
430 | ('_aliasarg', '$10') | |
431 | ('symbol', 'baz')) |
|
431 | ('symbol', 'baz')) | |
432 | >>> pprint(builddefn('"$1" or "foo"', args)) |
|
432 | >>> pprint(builddefn('"$1" or "foo"', args)) | |
433 | (or |
|
433 | (or | |
434 | ('string', '$1') |
|
434 | ('string', '$1') | |
435 | ('string', 'foo')) |
|
435 | ('string', 'foo')) | |
436 | """ |
|
436 | """ | |
437 | tree = cls._parse(defn) |
|
437 | tree = cls._parse(defn) | |
438 | if args: |
|
438 | if args: | |
439 | args = set(args) |
|
439 | args = set(args) | |
440 | else: |
|
440 | else: | |
441 | args = set() |
|
441 | args = set() | |
442 | return cls._relabelargs(tree, args) |
|
442 | return cls._relabelargs(tree, args) | |
443 |
|
443 | |||
444 | @classmethod |
|
444 | @classmethod | |
445 | def build(cls, decl, defn): |
|
445 | def build(cls, decl, defn): | |
446 | """Parse an alias declaration and definition into an alias object""" |
|
446 | """Parse an alias declaration and definition into an alias object""" | |
447 | repl = efmt = None |
|
447 | repl = efmt = None | |
448 | name, args, err = cls._builddecl(decl) |
|
448 | name, args, err = cls._builddecl(decl) | |
449 | if err: |
|
449 | if err: | |
450 | efmt = _('failed to parse the declaration of %(section)s ' |
|
450 | efmt = _('failed to parse the declaration of %(section)s ' | |
451 | '"%(name)s": %(error)s') |
|
451 | '"%(name)s": %(error)s') | |
452 | else: |
|
452 | else: | |
453 | try: |
|
453 | try: | |
454 | repl = cls._builddefn(defn, args) |
|
454 | repl = cls._builddefn(defn, args) | |
455 | except error.ParseError as inst: |
|
455 | except error.ParseError as inst: | |
456 | err = parseerrordetail(inst) |
|
456 | err = parseerrordetail(inst) | |
457 | efmt = _('failed to parse the definition of %(section)s ' |
|
457 | efmt = _('failed to parse the definition of %(section)s ' | |
458 | '"%(name)s": %(error)s') |
|
458 | '"%(name)s": %(error)s') | |
459 | if err: |
|
459 | if err: | |
460 | err = efmt % {'section': cls._section, 'name': name, 'error': err} |
|
460 | err = efmt % {'section': cls._section, 'name': name, 'error': err} | |
461 | return alias(name, args, err, repl) |
|
461 | return alias(name, args, err, repl) | |
462 |
|
462 | |||
463 | @classmethod |
|
463 | @classmethod | |
464 | def buildmap(cls, items): |
|
464 | def buildmap(cls, items): | |
465 | """Parse a list of alias (name, replacement) pairs into a dict of |
|
465 | """Parse a list of alias (name, replacement) pairs into a dict of | |
466 | alias objects""" |
|
466 | alias objects""" | |
467 | aliases = {} |
|
467 | aliases = {} | |
468 | for decl, defn in items: |
|
468 | for decl, defn in items: | |
469 | a = cls.build(decl, defn) |
|
469 | a = cls.build(decl, defn) | |
470 | aliases[a.name] = a |
|
470 | aliases[a.name] = a | |
471 | return aliases |
|
471 | return aliases | |
472 |
|
472 | |||
473 | @classmethod |
|
473 | @classmethod | |
474 | def _getalias(cls, aliases, tree): |
|
474 | def _getalias(cls, aliases, tree): | |
475 | """If tree looks like an unexpanded alias, return (alias, pattern-args) |
|
475 | """If tree looks like an unexpanded alias, return (alias, pattern-args) | |
476 | pair. Return None otherwise. |
|
476 | pair. Return None otherwise. | |
477 | """ |
|
477 | """ | |
478 | if not isinstance(tree, tuple): |
|
478 | if not isinstance(tree, tuple): | |
479 | return None |
|
479 | return None | |
480 | if tree[0] == cls._symbolnode: |
|
480 | if tree[0] == cls._symbolnode: | |
481 | name = tree[1] |
|
481 | name = tree[1] | |
482 | a = aliases.get(name) |
|
482 | a = aliases.get(name) | |
483 | if a and a.args is None: |
|
483 | if a and a.args is None: | |
484 | return a, None |
|
484 | return a, None | |
485 | func = cls._trygetfunc(tree) |
|
485 | func = cls._trygetfunc(tree) | |
486 | if func: |
|
486 | if func: | |
487 | name, args = func |
|
487 | name, args = func | |
488 | a = aliases.get(name) |
|
488 | a = aliases.get(name) | |
489 | if a and a.args is not None: |
|
489 | if a and a.args is not None: | |
490 | return a, args |
|
490 | return a, args | |
491 | return None |
|
491 | return None | |
492 |
|
492 | |||
493 | @classmethod |
|
493 | @classmethod | |
494 | def _expandargs(cls, tree, args): |
|
494 | def _expandargs(cls, tree, args): | |
495 | """Replace _aliasarg instances with the substitution value of the |
|
495 | """Replace _aliasarg instances with the substitution value of the | |
496 | same name in args, recursively. |
|
496 | same name in args, recursively. | |
497 | """ |
|
497 | """ | |
498 | if not isinstance(tree, tuple): |
|
498 | if not isinstance(tree, tuple): | |
499 | return tree |
|
499 | return tree | |
500 | if tree[0] == '_aliasarg': |
|
500 | if tree[0] == '_aliasarg': | |
501 | sym = tree[1] |
|
501 | sym = tree[1] | |
502 | return args[sym] |
|
502 | return args[sym] | |
503 | return tuple(cls._expandargs(t, args) for t in tree) |
|
503 | return tuple(cls._expandargs(t, args) for t in tree) | |
504 |
|
504 | |||
505 | @classmethod |
|
505 | @classmethod | |
506 | def _expand(cls, aliases, tree, expanding, cache): |
|
506 | def _expand(cls, aliases, tree, expanding, cache): | |
507 | if not isinstance(tree, tuple): |
|
507 | if not isinstance(tree, tuple): | |
508 | return tree |
|
508 | return tree | |
509 | r = cls._getalias(aliases, tree) |
|
509 | r = cls._getalias(aliases, tree) | |
510 | if r is None: |
|
510 | if r is None: | |
511 | return tuple(cls._expand(aliases, t, expanding, cache) |
|
511 | return tuple(cls._expand(aliases, t, expanding, cache) | |
512 | for t in tree) |
|
512 | for t in tree) | |
513 | a, l = r |
|
513 | a, l = r | |
514 | if a.error: |
|
514 | if a.error: | |
515 | raise error.Abort(a.error) |
|
515 | raise error.Abort(a.error) | |
516 | if a in expanding: |
|
516 | if a in expanding: | |
517 | raise error.ParseError(_('infinite expansion of %(section)s ' |
|
517 | raise error.ParseError(_('infinite expansion of %(section)s ' | |
518 | '"%(name)s" detected') |
|
518 | '"%(name)s" detected') | |
519 | % {'section': cls._section, 'name': a.name}) |
|
519 | % {'section': cls._section, 'name': a.name}) | |
520 | # get cacheable replacement tree by expanding aliases recursively |
|
520 | # get cacheable replacement tree by expanding aliases recursively | |
521 | expanding.append(a) |
|
521 | expanding.append(a) | |
522 | if a.name not in cache: |
|
522 | if a.name not in cache: | |
523 | cache[a.name] = cls._expand(aliases, a.replacement, expanding, |
|
523 | cache[a.name] = cls._expand(aliases, a.replacement, expanding, | |
524 | cache) |
|
524 | cache) | |
525 | result = cache[a.name] |
|
525 | result = cache[a.name] | |
526 | expanding.pop() |
|
526 | expanding.pop() | |
527 | if a.args is None: |
|
527 | if a.args is None: | |
528 | return result |
|
528 | return result | |
529 | # substitute function arguments in replacement tree |
|
529 | # substitute function arguments in replacement tree | |
530 | if len(l) != len(a.args): |
|
530 | if len(l) != len(a.args): | |
531 | raise error.ParseError(_('invalid number of arguments: %d') |
|
531 | raise error.ParseError(_('invalid number of arguments: %d') | |
532 | % len(l)) |
|
532 | % len(l)) | |
533 | l = [cls._expand(aliases, t, [], cache) for t in l] |
|
533 | l = [cls._expand(aliases, t, [], cache) for t in l] | |
534 | return cls._expandargs(result, dict(zip(a.args, l))) |
|
534 | return cls._expandargs(result, dict(zip(a.args, l))) | |
535 |
|
535 | |||
536 | @classmethod |
|
536 | @classmethod | |
537 | def expand(cls, aliases, tree): |
|
537 | def expand(cls, aliases, tree): | |
538 | """Expand aliases in tree, recursively. |
|
538 | """Expand aliases in tree, recursively. | |
539 |
|
539 | |||
540 | 'aliases' is a dictionary mapping user defined aliases to alias objects. |
|
540 | 'aliases' is a dictionary mapping user defined aliases to alias objects. | |
541 | """ |
|
541 | """ | |
542 | return cls._expand(aliases, tree, [], {}) |
|
542 | return cls._expand(aliases, tree, [], {}) |
@@ -1,2480 +1,2480 b'' | |||||
1 | $ HGENCODING=utf-8 |
|
1 | $ HGENCODING=utf-8 | |
2 | $ export HGENCODING |
|
2 | $ export HGENCODING | |
3 | $ cat > testrevset.py << EOF |
|
3 | $ cat > testrevset.py << EOF | |
4 | > import mercurial.revset |
|
4 | > import mercurial.revset | |
5 | > |
|
5 | > | |
6 | > baseset = mercurial.revset.baseset |
|
6 | > baseset = mercurial.revset.baseset | |
7 | > |
|
7 | > | |
8 | > def r3232(repo, subset, x): |
|
8 | > def r3232(repo, subset, x): | |
9 | > """"simple revset that return [3,2,3,2] |
|
9 | > """"simple revset that return [3,2,3,2] | |
10 | > |
|
10 | > | |
11 | > revisions duplicated on purpose. |
|
11 | > revisions duplicated on purpose. | |
12 | > """ |
|
12 | > """ | |
13 | > if 3 not in subset: |
|
13 | > if 3 not in subset: | |
14 | > if 2 in subset: |
|
14 | > if 2 in subset: | |
15 | > return baseset([2,2]) |
|
15 | > return baseset([2,2]) | |
16 | > return baseset() |
|
16 | > return baseset() | |
17 | > return baseset([3,3,2,2]) |
|
17 | > return baseset([3,3,2,2]) | |
18 | > |
|
18 | > | |
19 | > mercurial.revset.symbols['r3232'] = r3232 |
|
19 | > mercurial.revset.symbols['r3232'] = r3232 | |
20 | > EOF |
|
20 | > EOF | |
21 | $ cat >> $HGRCPATH << EOF |
|
21 | $ cat >> $HGRCPATH << EOF | |
22 | > [extensions] |
|
22 | > [extensions] | |
23 | > testrevset=$TESTTMP/testrevset.py |
|
23 | > testrevset=$TESTTMP/testrevset.py | |
24 | > EOF |
|
24 | > EOF | |
25 |
|
25 | |||
26 | $ try() { |
|
26 | $ try() { | |
27 | > hg debugrevspec --debug "$@" |
|
27 | > hg debugrevspec --debug "$@" | |
28 | > } |
|
28 | > } | |
29 |
|
29 | |||
30 | $ log() { |
|
30 | $ log() { | |
31 | > hg log --template '{rev}\n' -r "$1" |
|
31 | > hg log --template '{rev}\n' -r "$1" | |
32 | > } |
|
32 | > } | |
33 |
|
33 | |||
34 | $ hg init repo |
|
34 | $ hg init repo | |
35 | $ cd repo |
|
35 | $ cd repo | |
36 |
|
36 | |||
37 | $ echo a > a |
|
37 | $ echo a > a | |
38 | $ hg branch a |
|
38 | $ hg branch a | |
39 | marked working directory as branch a |
|
39 | marked working directory as branch a | |
40 | (branches are permanent and global, did you want a bookmark?) |
|
40 | (branches are permanent and global, did you want a bookmark?) | |
41 | $ hg ci -Aqm0 |
|
41 | $ hg ci -Aqm0 | |
42 |
|
42 | |||
43 | $ echo b > b |
|
43 | $ echo b > b | |
44 | $ hg branch b |
|
44 | $ hg branch b | |
45 | marked working directory as branch b |
|
45 | marked working directory as branch b | |
46 | $ hg ci -Aqm1 |
|
46 | $ hg ci -Aqm1 | |
47 |
|
47 | |||
48 | $ rm a |
|
48 | $ rm a | |
49 | $ hg branch a-b-c- |
|
49 | $ hg branch a-b-c- | |
50 | marked working directory as branch a-b-c- |
|
50 | marked working directory as branch a-b-c- | |
51 | $ hg ci -Aqm2 -u Bob |
|
51 | $ hg ci -Aqm2 -u Bob | |
52 |
|
52 | |||
53 | $ hg log -r "extra('branch', 'a-b-c-')" --template '{rev}\n' |
|
53 | $ hg log -r "extra('branch', 'a-b-c-')" --template '{rev}\n' | |
54 | 2 |
|
54 | 2 | |
55 | $ hg log -r "extra('branch')" --template '{rev}\n' |
|
55 | $ hg log -r "extra('branch')" --template '{rev}\n' | |
56 | 0 |
|
56 | 0 | |
57 | 1 |
|
57 | 1 | |
58 | 2 |
|
58 | 2 | |
59 | $ hg log -r "extra('branch', 're:a')" --template '{rev} {branch}\n' |
|
59 | $ hg log -r "extra('branch', 're:a')" --template '{rev} {branch}\n' | |
60 | 0 a |
|
60 | 0 a | |
61 | 2 a-b-c- |
|
61 | 2 a-b-c- | |
62 |
|
62 | |||
63 | $ hg co 1 |
|
63 | $ hg co 1 | |
64 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
64 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
65 | $ hg branch +a+b+c+ |
|
65 | $ hg branch +a+b+c+ | |
66 | marked working directory as branch +a+b+c+ |
|
66 | marked working directory as branch +a+b+c+ | |
67 | $ hg ci -Aqm3 |
|
67 | $ hg ci -Aqm3 | |
68 |
|
68 | |||
69 | $ hg co 2 # interleave |
|
69 | $ hg co 2 # interleave | |
70 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
70 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
71 | $ echo bb > b |
|
71 | $ echo bb > b | |
72 | $ hg branch -- -a-b-c- |
|
72 | $ hg branch -- -a-b-c- | |
73 | marked working directory as branch -a-b-c- |
|
73 | marked working directory as branch -a-b-c- | |
74 | $ hg ci -Aqm4 -d "May 12 2005" |
|
74 | $ hg ci -Aqm4 -d "May 12 2005" | |
75 |
|
75 | |||
76 | $ hg co 3 |
|
76 | $ hg co 3 | |
77 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
77 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
78 | $ hg branch !a/b/c/ |
|
78 | $ hg branch !a/b/c/ | |
79 | marked working directory as branch !a/b/c/ |
|
79 | marked working directory as branch !a/b/c/ | |
80 | $ hg ci -Aqm"5 bug" |
|
80 | $ hg ci -Aqm"5 bug" | |
81 |
|
81 | |||
82 | $ hg merge 4 |
|
82 | $ hg merge 4 | |
83 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
83 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
84 | (branch merge, don't forget to commit) |
|
84 | (branch merge, don't forget to commit) | |
85 | $ hg branch _a_b_c_ |
|
85 | $ hg branch _a_b_c_ | |
86 | marked working directory as branch _a_b_c_ |
|
86 | marked working directory as branch _a_b_c_ | |
87 | $ hg ci -Aqm"6 issue619" |
|
87 | $ hg ci -Aqm"6 issue619" | |
88 |
|
88 | |||
89 | $ hg branch .a.b.c. |
|
89 | $ hg branch .a.b.c. | |
90 | marked working directory as branch .a.b.c. |
|
90 | marked working directory as branch .a.b.c. | |
91 | $ hg ci -Aqm7 |
|
91 | $ hg ci -Aqm7 | |
92 |
|
92 | |||
93 | $ hg branch all |
|
93 | $ hg branch all | |
94 | marked working directory as branch all |
|
94 | marked working directory as branch all | |
95 |
|
95 | |||
96 | $ hg co 4 |
|
96 | $ hg co 4 | |
97 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
97 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
98 | $ hg branch Γ© |
|
98 | $ hg branch Γ© | |
99 | marked working directory as branch \xc3\xa9 (esc) |
|
99 | marked working directory as branch \xc3\xa9 (esc) | |
100 | $ hg ci -Aqm9 |
|
100 | $ hg ci -Aqm9 | |
101 |
|
101 | |||
102 | $ hg tag -r6 1.0 |
|
102 | $ hg tag -r6 1.0 | |
103 | $ hg bookmark -r6 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx |
|
103 | $ hg bookmark -r6 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx | |
104 |
|
104 | |||
105 | $ hg clone --quiet -U -r 7 . ../remote1 |
|
105 | $ hg clone --quiet -U -r 7 . ../remote1 | |
106 | $ hg clone --quiet -U -r 8 . ../remote2 |
|
106 | $ hg clone --quiet -U -r 8 . ../remote2 | |
107 | $ echo "[paths]" >> .hg/hgrc |
|
107 | $ echo "[paths]" >> .hg/hgrc | |
108 | $ echo "default = ../remote1" >> .hg/hgrc |
|
108 | $ echo "default = ../remote1" >> .hg/hgrc | |
109 |
|
109 | |||
110 | trivial |
|
110 | trivial | |
111 |
|
111 | |||
112 | $ try 0:1 |
|
112 | $ try 0:1 | |
113 | (range |
|
113 | (range | |
114 | ('symbol', '0') |
|
114 | ('symbol', '0') | |
115 | ('symbol', '1')) |
|
115 | ('symbol', '1')) | |
116 | * set: |
|
116 | * set: | |
117 | <spanset+ 0:1> |
|
117 | <spanset+ 0:1> | |
118 | 0 |
|
118 | 0 | |
119 | 1 |
|
119 | 1 | |
120 | $ try --optimize : |
|
120 | $ try --optimize : | |
121 | (rangeall |
|
121 | (rangeall | |
122 | None) |
|
122 | None) | |
123 | * optimized: |
|
123 | * optimized: | |
124 | (range |
|
124 | (range | |
125 | ('string', '0') |
|
125 | ('string', '0') | |
126 | ('string', 'tip')) |
|
126 | ('string', 'tip')) | |
127 | * set: |
|
127 | * set: | |
128 | <spanset+ 0:9> |
|
128 | <spanset+ 0:9> | |
129 | 0 |
|
129 | 0 | |
130 | 1 |
|
130 | 1 | |
131 | 2 |
|
131 | 2 | |
132 | 3 |
|
132 | 3 | |
133 | 4 |
|
133 | 4 | |
134 | 5 |
|
134 | 5 | |
135 | 6 |
|
135 | 6 | |
136 | 7 |
|
136 | 7 | |
137 | 8 |
|
137 | 8 | |
138 | 9 |
|
138 | 9 | |
139 | $ try 3::6 |
|
139 | $ try 3::6 | |
140 | (dagrange |
|
140 | (dagrange | |
141 | ('symbol', '3') |
|
141 | ('symbol', '3') | |
142 | ('symbol', '6')) |
|
142 | ('symbol', '6')) | |
143 | * set: |
|
143 | * set: | |
144 | <baseset+ [3, 5, 6]> |
|
144 | <baseset+ [3, 5, 6]> | |
145 | 3 |
|
145 | 3 | |
146 | 5 |
|
146 | 5 | |
147 | 6 |
|
147 | 6 | |
148 | $ try '0|1|2' |
|
148 | $ try '0|1|2' | |
149 | (or |
|
149 | (or | |
150 | ('symbol', '0') |
|
150 | ('symbol', '0') | |
151 | ('symbol', '1') |
|
151 | ('symbol', '1') | |
152 | ('symbol', '2')) |
|
152 | ('symbol', '2')) | |
153 | * set: |
|
153 | * set: | |
154 | <baseset [0, 1, 2]> |
|
154 | <baseset [0, 1, 2]> | |
155 | 0 |
|
155 | 0 | |
156 | 1 |
|
156 | 1 | |
157 | 2 |
|
157 | 2 | |
158 |
|
158 | |||
159 | names that should work without quoting |
|
159 | names that should work without quoting | |
160 |
|
160 | |||
161 | $ try a |
|
161 | $ try a | |
162 | ('symbol', 'a') |
|
162 | ('symbol', 'a') | |
163 | * set: |
|
163 | * set: | |
164 | <baseset [0]> |
|
164 | <baseset [0]> | |
165 | 0 |
|
165 | 0 | |
166 | $ try b-a |
|
166 | $ try b-a | |
167 | (minus |
|
167 | (minus | |
168 | ('symbol', 'b') |
|
168 | ('symbol', 'b') | |
169 | ('symbol', 'a')) |
|
169 | ('symbol', 'a')) | |
170 | * set: |
|
170 | * set: | |
171 | <filteredset |
|
171 | <filteredset | |
172 | <baseset [1]>, |
|
172 | <baseset [1]>, | |
173 | <not |
|
173 | <not | |
174 | <baseset [0]>>> |
|
174 | <baseset [0]>>> | |
175 | 1 |
|
175 | 1 | |
176 | $ try _a_b_c_ |
|
176 | $ try _a_b_c_ | |
177 | ('symbol', '_a_b_c_') |
|
177 | ('symbol', '_a_b_c_') | |
178 | * set: |
|
178 | * set: | |
179 | <baseset [6]> |
|
179 | <baseset [6]> | |
180 | 6 |
|
180 | 6 | |
181 | $ try _a_b_c_-a |
|
181 | $ try _a_b_c_-a | |
182 | (minus |
|
182 | (minus | |
183 | ('symbol', '_a_b_c_') |
|
183 | ('symbol', '_a_b_c_') | |
184 | ('symbol', 'a')) |
|
184 | ('symbol', 'a')) | |
185 | * set: |
|
185 | * set: | |
186 | <filteredset |
|
186 | <filteredset | |
187 | <baseset [6]>, |
|
187 | <baseset [6]>, | |
188 | <not |
|
188 | <not | |
189 | <baseset [0]>>> |
|
189 | <baseset [0]>>> | |
190 | 6 |
|
190 | 6 | |
191 | $ try .a.b.c. |
|
191 | $ try .a.b.c. | |
192 | ('symbol', '.a.b.c.') |
|
192 | ('symbol', '.a.b.c.') | |
193 | * set: |
|
193 | * set: | |
194 | <baseset [7]> |
|
194 | <baseset [7]> | |
195 | 7 |
|
195 | 7 | |
196 | $ try .a.b.c.-a |
|
196 | $ try .a.b.c.-a | |
197 | (minus |
|
197 | (minus | |
198 | ('symbol', '.a.b.c.') |
|
198 | ('symbol', '.a.b.c.') | |
199 | ('symbol', 'a')) |
|
199 | ('symbol', 'a')) | |
200 | * set: |
|
200 | * set: | |
201 | <filteredset |
|
201 | <filteredset | |
202 | <baseset [7]>, |
|
202 | <baseset [7]>, | |
203 | <not |
|
203 | <not | |
204 | <baseset [0]>>> |
|
204 | <baseset [0]>>> | |
205 | 7 |
|
205 | 7 | |
206 |
|
206 | |||
207 | names that should be caught by fallback mechanism |
|
207 | names that should be caught by fallback mechanism | |
208 |
|
208 | |||
209 | $ try -- '-a-b-c-' |
|
209 | $ try -- '-a-b-c-' | |
210 | ('symbol', '-a-b-c-') |
|
210 | ('symbol', '-a-b-c-') | |
211 | * set: |
|
211 | * set: | |
212 | <baseset [4]> |
|
212 | <baseset [4]> | |
213 | 4 |
|
213 | 4 | |
214 | $ log -a-b-c- |
|
214 | $ log -a-b-c- | |
215 | 4 |
|
215 | 4 | |
216 | $ try '+a+b+c+' |
|
216 | $ try '+a+b+c+' | |
217 | ('symbol', '+a+b+c+') |
|
217 | ('symbol', '+a+b+c+') | |
218 | * set: |
|
218 | * set: | |
219 | <baseset [3]> |
|
219 | <baseset [3]> | |
220 | 3 |
|
220 | 3 | |
221 | $ try '+a+b+c+:' |
|
221 | $ try '+a+b+c+:' | |
222 | (rangepost |
|
222 | (rangepost | |
223 | ('symbol', '+a+b+c+')) |
|
223 | ('symbol', '+a+b+c+')) | |
224 | * set: |
|
224 | * set: | |
225 | <spanset+ 3:9> |
|
225 | <spanset+ 3:9> | |
226 | 3 |
|
226 | 3 | |
227 | 4 |
|
227 | 4 | |
228 | 5 |
|
228 | 5 | |
229 | 6 |
|
229 | 6 | |
230 | 7 |
|
230 | 7 | |
231 | 8 |
|
231 | 8 | |
232 | 9 |
|
232 | 9 | |
233 | $ try ':+a+b+c+' |
|
233 | $ try ':+a+b+c+' | |
234 | (rangepre |
|
234 | (rangepre | |
235 | ('symbol', '+a+b+c+')) |
|
235 | ('symbol', '+a+b+c+')) | |
236 | * set: |
|
236 | * set: | |
237 | <spanset+ 0:3> |
|
237 | <spanset+ 0:3> | |
238 | 0 |
|
238 | 0 | |
239 | 1 |
|
239 | 1 | |
240 | 2 |
|
240 | 2 | |
241 | 3 |
|
241 | 3 | |
242 | $ try -- '-a-b-c-:+a+b+c+' |
|
242 | $ try -- '-a-b-c-:+a+b+c+' | |
243 | (range |
|
243 | (range | |
244 | ('symbol', '-a-b-c-') |
|
244 | ('symbol', '-a-b-c-') | |
245 | ('symbol', '+a+b+c+')) |
|
245 | ('symbol', '+a+b+c+')) | |
246 | * set: |
|
246 | * set: | |
247 | <spanset- 3:4> |
|
247 | <spanset- 3:4> | |
248 | 4 |
|
248 | 4 | |
249 | 3 |
|
249 | 3 | |
250 | $ log '-a-b-c-:+a+b+c+' |
|
250 | $ log '-a-b-c-:+a+b+c+' | |
251 | 4 |
|
251 | 4 | |
252 | 3 |
|
252 | 3 | |
253 |
|
253 | |||
254 | $ try -- -a-b-c--a # complains |
|
254 | $ try -- -a-b-c--a # complains | |
255 | (minus |
|
255 | (minus | |
256 | (minus |
|
256 | (minus | |
257 | (minus |
|
257 | (minus | |
258 | (negate |
|
258 | (negate | |
259 | ('symbol', 'a')) |
|
259 | ('symbol', 'a')) | |
260 | ('symbol', 'b')) |
|
260 | ('symbol', 'b')) | |
261 | ('symbol', 'c')) |
|
261 | ('symbol', 'c')) | |
262 | (negate |
|
262 | (negate | |
263 | ('symbol', 'a'))) |
|
263 | ('symbol', 'a'))) | |
264 | abort: unknown revision '-a'! |
|
264 | abort: unknown revision '-a'! | |
265 | [255] |
|
265 | [255] | |
266 | $ try Γ© |
|
266 | $ try Γ© | |
267 | ('symbol', '\xc3\xa9') |
|
267 | ('symbol', '\xc3\xa9') | |
268 | * set: |
|
268 | * set: | |
269 | <baseset [9]> |
|
269 | <baseset [9]> | |
270 | 9 |
|
270 | 9 | |
271 |
|
271 | |||
272 | no quoting needed |
|
272 | no quoting needed | |
273 |
|
273 | |||
274 | $ log ::a-b-c- |
|
274 | $ log ::a-b-c- | |
275 | 0 |
|
275 | 0 | |
276 | 1 |
|
276 | 1 | |
277 | 2 |
|
277 | 2 | |
278 |
|
278 | |||
279 | quoting needed |
|
279 | quoting needed | |
280 |
|
280 | |||
281 | $ try '"-a-b-c-"-a' |
|
281 | $ try '"-a-b-c-"-a' | |
282 | (minus |
|
282 | (minus | |
283 | ('string', '-a-b-c-') |
|
283 | ('string', '-a-b-c-') | |
284 | ('symbol', 'a')) |
|
284 | ('symbol', 'a')) | |
285 | * set: |
|
285 | * set: | |
286 | <filteredset |
|
286 | <filteredset | |
287 | <baseset [4]>, |
|
287 | <baseset [4]>, | |
288 | <not |
|
288 | <not | |
289 | <baseset [0]>>> |
|
289 | <baseset [0]>>> | |
290 | 4 |
|
290 | 4 | |
291 |
|
291 | |||
292 | $ log '1 or 2' |
|
292 | $ log '1 or 2' | |
293 | 1 |
|
293 | 1 | |
294 | 2 |
|
294 | 2 | |
295 | $ log '1|2' |
|
295 | $ log '1|2' | |
296 | 1 |
|
296 | 1 | |
297 | 2 |
|
297 | 2 | |
298 | $ log '1 and 2' |
|
298 | $ log '1 and 2' | |
299 | $ log '1&2' |
|
299 | $ log '1&2' | |
300 | $ try '1&2|3' # precedence - and is higher |
|
300 | $ try '1&2|3' # precedence - and is higher | |
301 | (or |
|
301 | (or | |
302 | (and |
|
302 | (and | |
303 | ('symbol', '1') |
|
303 | ('symbol', '1') | |
304 | ('symbol', '2')) |
|
304 | ('symbol', '2')) | |
305 | ('symbol', '3')) |
|
305 | ('symbol', '3')) | |
306 | * set: |
|
306 | * set: | |
307 | <addset |
|
307 | <addset | |
308 | <baseset []>, |
|
308 | <baseset []>, | |
309 | <baseset [3]>> |
|
309 | <baseset [3]>> | |
310 | 3 |
|
310 | 3 | |
311 | $ try '1|2&3' |
|
311 | $ try '1|2&3' | |
312 | (or |
|
312 | (or | |
313 | ('symbol', '1') |
|
313 | ('symbol', '1') | |
314 | (and |
|
314 | (and | |
315 | ('symbol', '2') |
|
315 | ('symbol', '2') | |
316 | ('symbol', '3'))) |
|
316 | ('symbol', '3'))) | |
317 | * set: |
|
317 | * set: | |
318 | <addset |
|
318 | <addset | |
319 | <baseset [1]>, |
|
319 | <baseset [1]>, | |
320 | <baseset []>> |
|
320 | <baseset []>> | |
321 | 1 |
|
321 | 1 | |
322 | $ try '1&2&3' # associativity |
|
322 | $ try '1&2&3' # associativity | |
323 | (and |
|
323 | (and | |
324 | (and |
|
324 | (and | |
325 | ('symbol', '1') |
|
325 | ('symbol', '1') | |
326 | ('symbol', '2')) |
|
326 | ('symbol', '2')) | |
327 | ('symbol', '3')) |
|
327 | ('symbol', '3')) | |
328 | * set: |
|
328 | * set: | |
329 | <baseset []> |
|
329 | <baseset []> | |
330 | $ try '1|(2|3)' |
|
330 | $ try '1|(2|3)' | |
331 | (or |
|
331 | (or | |
332 | ('symbol', '1') |
|
332 | ('symbol', '1') | |
333 | (group |
|
333 | (group | |
334 | (or |
|
334 | (or | |
335 | ('symbol', '2') |
|
335 | ('symbol', '2') | |
336 | ('symbol', '3')))) |
|
336 | ('symbol', '3')))) | |
337 | * set: |
|
337 | * set: | |
338 | <addset |
|
338 | <addset | |
339 | <baseset [1]>, |
|
339 | <baseset [1]>, | |
340 | <baseset [2, 3]>> |
|
340 | <baseset [2, 3]>> | |
341 | 1 |
|
341 | 1 | |
342 | 2 |
|
342 | 2 | |
343 | 3 |
|
343 | 3 | |
344 | $ log '1.0' # tag |
|
344 | $ log '1.0' # tag | |
345 | 6 |
|
345 | 6 | |
346 | $ log 'a' # branch |
|
346 | $ log 'a' # branch | |
347 | 0 |
|
347 | 0 | |
348 | $ log '2785f51ee' |
|
348 | $ log '2785f51ee' | |
349 | 0 |
|
349 | 0 | |
350 | $ log 'date(2005)' |
|
350 | $ log 'date(2005)' | |
351 | 4 |
|
351 | 4 | |
352 | $ log 'date(this is a test)' |
|
352 | $ log 'date(this is a test)' | |
353 | hg: parse error at 10: unexpected token: symbol |
|
353 | hg: parse error at 10: unexpected token: symbol | |
354 | [255] |
|
354 | [255] | |
355 | $ log 'date()' |
|
355 | $ log 'date()' | |
356 | hg: parse error: date requires a string |
|
356 | hg: parse error: date requires a string | |
357 | [255] |
|
357 | [255] | |
358 | $ log 'date' |
|
358 | $ log 'date' | |
359 | abort: unknown revision 'date'! |
|
359 | abort: unknown revision 'date'! | |
360 | [255] |
|
360 | [255] | |
361 | $ log 'date(' |
|
361 | $ log 'date(' | |
362 | hg: parse error at 5: not a prefix: end |
|
362 | hg: parse error at 5: not a prefix: end | |
363 | [255] |
|
363 | [255] | |
364 | $ log 'date("\xy")' |
|
364 | $ log 'date("\xy")' | |
365 | hg: parse error: invalid \x escape |
|
365 | hg: parse error: invalid \x escape | |
366 | [255] |
|
366 | [255] | |
367 | $ log 'date(tip)' |
|
367 | $ log 'date(tip)' | |
368 | abort: invalid date: 'tip' |
|
368 | abort: invalid date: 'tip' | |
369 | [255] |
|
369 | [255] | |
370 | $ log '0:date' |
|
370 | $ log '0:date' | |
371 | abort: unknown revision 'date'! |
|
371 | abort: unknown revision 'date'! | |
372 | [255] |
|
372 | [255] | |
373 | $ log '::"date"' |
|
373 | $ log '::"date"' | |
374 | abort: unknown revision 'date'! |
|
374 | abort: unknown revision 'date'! | |
375 | [255] |
|
375 | [255] | |
376 | $ hg book date -r 4 |
|
376 | $ hg book date -r 4 | |
377 | $ log '0:date' |
|
377 | $ log '0:date' | |
378 | 0 |
|
378 | 0 | |
379 | 1 |
|
379 | 1 | |
380 | 2 |
|
380 | 2 | |
381 | 3 |
|
381 | 3 | |
382 | 4 |
|
382 | 4 | |
383 | $ log '::date' |
|
383 | $ log '::date' | |
384 | 0 |
|
384 | 0 | |
385 | 1 |
|
385 | 1 | |
386 | 2 |
|
386 | 2 | |
387 | 4 |
|
387 | 4 | |
388 | $ log '::"date"' |
|
388 | $ log '::"date"' | |
389 | 0 |
|
389 | 0 | |
390 | 1 |
|
390 | 1 | |
391 | 2 |
|
391 | 2 | |
392 | 4 |
|
392 | 4 | |
393 | $ log 'date(2005) and 1::' |
|
393 | $ log 'date(2005) and 1::' | |
394 | 4 |
|
394 | 4 | |
395 | $ hg book -d date |
|
395 | $ hg book -d date | |
396 |
|
396 | |||
397 | keyword arguments |
|
397 | keyword arguments | |
398 |
|
398 | |||
399 | $ log 'extra(branch, value=a)' |
|
399 | $ log 'extra(branch, value=a)' | |
400 | 0 |
|
400 | 0 | |
401 |
|
401 | |||
402 | $ log 'extra(branch, a, b)' |
|
402 | $ log 'extra(branch, a, b)' | |
403 | hg: parse error: extra takes at most 2 arguments |
|
403 | hg: parse error: extra takes at most 2 arguments | |
404 | [255] |
|
404 | [255] | |
405 | $ log 'extra(a, label=b)' |
|
405 | $ log 'extra(a, label=b)' | |
406 | hg: parse error: extra got multiple values for keyword argument 'label' |
|
406 | hg: parse error: extra got multiple values for keyword argument 'label' | |
407 | [255] |
|
407 | [255] | |
408 | $ log 'extra(label=branch, default)' |
|
408 | $ log 'extra(label=branch, default)' | |
409 | hg: parse error: extra got an invalid argument |
|
409 | hg: parse error: extra got an invalid argument | |
410 | [255] |
|
410 | [255] | |
411 | $ log 'extra(branch, foo+bar=baz)' |
|
411 | $ log 'extra(branch, foo+bar=baz)' | |
412 | hg: parse error: extra got an invalid argument |
|
412 | hg: parse error: extra got an invalid argument | |
413 | [255] |
|
413 | [255] | |
414 | $ log 'extra(unknown=branch)' |
|
414 | $ log 'extra(unknown=branch)' | |
415 | hg: parse error: extra got an unexpected keyword argument 'unknown' |
|
415 | hg: parse error: extra got an unexpected keyword argument 'unknown' | |
416 | [255] |
|
416 | [255] | |
417 |
|
417 | |||
418 | $ try 'foo=bar|baz' |
|
418 | $ try 'foo=bar|baz' | |
419 | (keyvalue |
|
419 | (keyvalue | |
420 | ('symbol', 'foo') |
|
420 | ('symbol', 'foo') | |
421 | (or |
|
421 | (or | |
422 | ('symbol', 'bar') |
|
422 | ('symbol', 'bar') | |
423 | ('symbol', 'baz'))) |
|
423 | ('symbol', 'baz'))) | |
424 | hg: parse error: can't use a key-value pair in this context |
|
424 | hg: parse error: can't use a key-value pair in this context | |
425 | [255] |
|
425 | [255] | |
426 |
|
426 | |||
427 | Test that symbols only get parsed as functions if there's an opening |
|
427 | Test that symbols only get parsed as functions if there's an opening | |
428 | parenthesis. |
|
428 | parenthesis. | |
429 |
|
429 | |||
430 | $ hg book only -r 9 |
|
430 | $ hg book only -r 9 | |
431 | $ log 'only(only)' # Outer "only" is a function, inner "only" is the bookmark |
|
431 | $ log 'only(only)' # Outer "only" is a function, inner "only" is the bookmark | |
432 | 8 |
|
432 | 8 | |
433 | 9 |
|
433 | 9 | |
434 |
|
434 | |||
435 | ancestor can accept 0 or more arguments |
|
435 | ancestor can accept 0 or more arguments | |
436 |
|
436 | |||
437 | $ log 'ancestor()' |
|
437 | $ log 'ancestor()' | |
438 | $ log 'ancestor(1)' |
|
438 | $ log 'ancestor(1)' | |
439 | 1 |
|
439 | 1 | |
440 | $ log 'ancestor(4,5)' |
|
440 | $ log 'ancestor(4,5)' | |
441 | 1 |
|
441 | 1 | |
442 | $ log 'ancestor(4,5) and 4' |
|
442 | $ log 'ancestor(4,5) and 4' | |
443 | $ log 'ancestor(0,0,1,3)' |
|
443 | $ log 'ancestor(0,0,1,3)' | |
444 | 0 |
|
444 | 0 | |
445 | $ log 'ancestor(3,1,5,3,5,1)' |
|
445 | $ log 'ancestor(3,1,5,3,5,1)' | |
446 | 1 |
|
446 | 1 | |
447 | $ log 'ancestor(0,1,3,5)' |
|
447 | $ log 'ancestor(0,1,3,5)' | |
448 | 0 |
|
448 | 0 | |
449 | $ log 'ancestor(1,2,3,4,5)' |
|
449 | $ log 'ancestor(1,2,3,4,5)' | |
450 | 1 |
|
450 | 1 | |
451 |
|
451 | |||
452 | test ancestors |
|
452 | test ancestors | |
453 |
|
453 | |||
454 | $ log 'ancestors(5)' |
|
454 | $ log 'ancestors(5)' | |
455 | 0 |
|
455 | 0 | |
456 | 1 |
|
456 | 1 | |
457 | 3 |
|
457 | 3 | |
458 | 5 |
|
458 | 5 | |
459 | $ log 'ancestor(ancestors(5))' |
|
459 | $ log 'ancestor(ancestors(5))' | |
460 | 0 |
|
460 | 0 | |
461 | $ log '::r3232()' |
|
461 | $ log '::r3232()' | |
462 | 0 |
|
462 | 0 | |
463 | 1 |
|
463 | 1 | |
464 | 2 |
|
464 | 2 | |
465 | 3 |
|
465 | 3 | |
466 |
|
466 | |||
467 | $ log 'author(bob)' |
|
467 | $ log 'author(bob)' | |
468 | 2 |
|
468 | 2 | |
469 | $ log 'author("re:bob|test")' |
|
469 | $ log 'author("re:bob|test")' | |
470 | 0 |
|
470 | 0 | |
471 | 1 |
|
471 | 1 | |
472 | 2 |
|
472 | 2 | |
473 | 3 |
|
473 | 3 | |
474 | 4 |
|
474 | 4 | |
475 | 5 |
|
475 | 5 | |
476 | 6 |
|
476 | 6 | |
477 | 7 |
|
477 | 7 | |
478 | 8 |
|
478 | 8 | |
479 | 9 |
|
479 | 9 | |
480 | $ log 'branch(Γ©)' |
|
480 | $ log 'branch(Γ©)' | |
481 | 8 |
|
481 | 8 | |
482 | 9 |
|
482 | 9 | |
483 | $ log 'branch(a)' |
|
483 | $ log 'branch(a)' | |
484 | 0 |
|
484 | 0 | |
485 | $ hg log -r 'branch("re:a")' --template '{rev} {branch}\n' |
|
485 | $ hg log -r 'branch("re:a")' --template '{rev} {branch}\n' | |
486 | 0 a |
|
486 | 0 a | |
487 | 2 a-b-c- |
|
487 | 2 a-b-c- | |
488 | 3 +a+b+c+ |
|
488 | 3 +a+b+c+ | |
489 | 4 -a-b-c- |
|
489 | 4 -a-b-c- | |
490 | 5 !a/b/c/ |
|
490 | 5 !a/b/c/ | |
491 | 6 _a_b_c_ |
|
491 | 6 _a_b_c_ | |
492 | 7 .a.b.c. |
|
492 | 7 .a.b.c. | |
493 | $ log 'children(ancestor(4,5))' |
|
493 | $ log 'children(ancestor(4,5))' | |
494 | 2 |
|
494 | 2 | |
495 | 3 |
|
495 | 3 | |
496 | $ log 'closed()' |
|
496 | $ log 'closed()' | |
497 | $ log 'contains(a)' |
|
497 | $ log 'contains(a)' | |
498 | 0 |
|
498 | 0 | |
499 | 1 |
|
499 | 1 | |
500 | 3 |
|
500 | 3 | |
501 | 5 |
|
501 | 5 | |
502 | $ log 'contains("../repo/a")' |
|
502 | $ log 'contains("../repo/a")' | |
503 | 0 |
|
503 | 0 | |
504 | 1 |
|
504 | 1 | |
505 | 3 |
|
505 | 3 | |
506 | 5 |
|
506 | 5 | |
507 | $ log 'desc(B)' |
|
507 | $ log 'desc(B)' | |
508 | 5 |
|
508 | 5 | |
509 | $ log 'descendants(2 or 3)' |
|
509 | $ log 'descendants(2 or 3)' | |
510 | 2 |
|
510 | 2 | |
511 | 3 |
|
511 | 3 | |
512 | 4 |
|
512 | 4 | |
513 | 5 |
|
513 | 5 | |
514 | 6 |
|
514 | 6 | |
515 | 7 |
|
515 | 7 | |
516 | 8 |
|
516 | 8 | |
517 | 9 |
|
517 | 9 | |
518 | $ log 'file("b*")' |
|
518 | $ log 'file("b*")' | |
519 | 1 |
|
519 | 1 | |
520 | 4 |
|
520 | 4 | |
521 | $ log 'filelog("b")' |
|
521 | $ log 'filelog("b")' | |
522 | 1 |
|
522 | 1 | |
523 | 4 |
|
523 | 4 | |
524 | $ log 'filelog("../repo/b")' |
|
524 | $ log 'filelog("../repo/b")' | |
525 | 1 |
|
525 | 1 | |
526 | 4 |
|
526 | 4 | |
527 | $ log 'follow()' |
|
527 | $ log 'follow()' | |
528 | 0 |
|
528 | 0 | |
529 | 1 |
|
529 | 1 | |
530 | 2 |
|
530 | 2 | |
531 | 4 |
|
531 | 4 | |
532 | 8 |
|
532 | 8 | |
533 | 9 |
|
533 | 9 | |
534 | $ log 'grep("issue\d+")' |
|
534 | $ log 'grep("issue\d+")' | |
535 | 6 |
|
535 | 6 | |
536 | $ try 'grep("(")' # invalid regular expression |
|
536 | $ try 'grep("(")' # invalid regular expression | |
537 | (func |
|
537 | (func | |
538 | ('symbol', 'grep') |
|
538 | ('symbol', 'grep') | |
539 | ('string', '(')) |
|
539 | ('string', '(')) | |
540 | hg: parse error: invalid match pattern: unbalanced parenthesis |
|
540 | hg: parse error: invalid match pattern: unbalanced parenthesis | |
541 | [255] |
|
541 | [255] | |
542 | $ try 'grep("\bissue\d+")' |
|
542 | $ try 'grep("\bissue\d+")' | |
543 | (func |
|
543 | (func | |
544 | ('symbol', 'grep') |
|
544 | ('symbol', 'grep') | |
545 | ('string', '\x08issue\\d+')) |
|
545 | ('string', '\x08issue\\d+')) | |
546 | * set: |
|
546 | * set: | |
547 | <filteredset |
|
547 | <filteredset | |
548 | <fullreposet+ 0:9>, |
|
548 | <fullreposet+ 0:9>, | |
549 | <grep '\x08issue\\d+'>> |
|
549 | <grep '\x08issue\\d+'>> | |
550 | $ try 'grep(r"\bissue\d+")' |
|
550 | $ try 'grep(r"\bissue\d+")' | |
551 | (func |
|
551 | (func | |
552 | ('symbol', 'grep') |
|
552 | ('symbol', 'grep') | |
553 | ('string', '\\bissue\\d+')) |
|
553 | ('string', '\\bissue\\d+')) | |
554 | * set: |
|
554 | * set: | |
555 | <filteredset |
|
555 | <filteredset | |
556 | <fullreposet+ 0:9>, |
|
556 | <fullreposet+ 0:9>, | |
557 | <grep '\\bissue\\d+'>> |
|
557 | <grep '\\bissue\\d+'>> | |
558 | 6 |
|
558 | 6 | |
559 | $ try 'grep(r"\")' |
|
559 | $ try 'grep(r"\")' | |
560 | hg: parse error at 7: unterminated string |
|
560 | hg: parse error at 7: unterminated string | |
561 | [255] |
|
561 | [255] | |
562 | $ log 'head()' |
|
562 | $ log 'head()' | |
563 | 0 |
|
563 | 0 | |
564 | 1 |
|
564 | 1 | |
565 | 2 |
|
565 | 2 | |
566 | 3 |
|
566 | 3 | |
567 | 4 |
|
567 | 4 | |
568 | 5 |
|
568 | 5 | |
569 | 6 |
|
569 | 6 | |
570 | 7 |
|
570 | 7 | |
571 | 9 |
|
571 | 9 | |
572 | $ log 'heads(6::)' |
|
572 | $ log 'heads(6::)' | |
573 | 7 |
|
573 | 7 | |
574 | $ log 'keyword(issue)' |
|
574 | $ log 'keyword(issue)' | |
575 | 6 |
|
575 | 6 | |
576 | $ log 'keyword("test a")' |
|
576 | $ log 'keyword("test a")' | |
577 | $ log 'limit(head(), 1)' |
|
577 | $ log 'limit(head(), 1)' | |
578 | 0 |
|
578 | 0 | |
579 | $ log 'limit(author("re:bob|test"), 3, 5)' |
|
579 | $ log 'limit(author("re:bob|test"), 3, 5)' | |
580 | 5 |
|
580 | 5 | |
581 | 6 |
|
581 | 6 | |
582 | 7 |
|
582 | 7 | |
583 | $ log 'limit(author("re:bob|test"), offset=6)' |
|
583 | $ log 'limit(author("re:bob|test"), offset=6)' | |
584 | 6 |
|
584 | 6 | |
585 | $ log 'limit(author("re:bob|test"), offset=10)' |
|
585 | $ log 'limit(author("re:bob|test"), offset=10)' | |
586 | $ log 'limit(all(), 1, -1)' |
|
586 | $ log 'limit(all(), 1, -1)' | |
587 | hg: parse error: negative offset |
|
587 | hg: parse error: negative offset | |
588 | [255] |
|
588 | [255] | |
589 | $ log 'matching(6)' |
|
589 | $ log 'matching(6)' | |
590 | 6 |
|
590 | 6 | |
591 | $ log 'matching(6:7, "phase parents user date branch summary files description substate")' |
|
591 | $ log 'matching(6:7, "phase parents user date branch summary files description substate")' | |
592 | 6 |
|
592 | 6 | |
593 | 7 |
|
593 | 7 | |
594 |
|
594 | |||
595 | Testing min and max |
|
595 | Testing min and max | |
596 |
|
596 | |||
597 | max: simple |
|
597 | max: simple | |
598 |
|
598 | |||
599 | $ log 'max(contains(a))' |
|
599 | $ log 'max(contains(a))' | |
600 | 5 |
|
600 | 5 | |
601 |
|
601 | |||
602 | max: simple on unordered set) |
|
602 | max: simple on unordered set) | |
603 |
|
603 | |||
604 | $ log 'max((4+0+2+5+7) and contains(a))' |
|
604 | $ log 'max((4+0+2+5+7) and contains(a))' | |
605 | 5 |
|
605 | 5 | |
606 |
|
606 | |||
607 | max: no result |
|
607 | max: no result | |
608 |
|
608 | |||
609 | $ log 'max(contains(stringthatdoesnotappearanywhere))' |
|
609 | $ log 'max(contains(stringthatdoesnotappearanywhere))' | |
610 |
|
610 | |||
611 | max: no result on unordered set |
|
611 | max: no result on unordered set | |
612 |
|
612 | |||
613 | $ log 'max((4+0+2+5+7) and contains(stringthatdoesnotappearanywhere))' |
|
613 | $ log 'max((4+0+2+5+7) and contains(stringthatdoesnotappearanywhere))' | |
614 |
|
614 | |||
615 | min: simple |
|
615 | min: simple | |
616 |
|
616 | |||
617 | $ log 'min(contains(a))' |
|
617 | $ log 'min(contains(a))' | |
618 | 0 |
|
618 | 0 | |
619 |
|
619 | |||
620 | min: simple on unordered set |
|
620 | min: simple on unordered set | |
621 |
|
621 | |||
622 | $ log 'min((4+0+2+5+7) and contains(a))' |
|
622 | $ log 'min((4+0+2+5+7) and contains(a))' | |
623 | 0 |
|
623 | 0 | |
624 |
|
624 | |||
625 | min: empty |
|
625 | min: empty | |
626 |
|
626 | |||
627 | $ log 'min(contains(stringthatdoesnotappearanywhere))' |
|
627 | $ log 'min(contains(stringthatdoesnotappearanywhere))' | |
628 |
|
628 | |||
629 | min: empty on unordered set |
|
629 | min: empty on unordered set | |
630 |
|
630 | |||
631 | $ log 'min((4+0+2+5+7) and contains(stringthatdoesnotappearanywhere))' |
|
631 | $ log 'min((4+0+2+5+7) and contains(stringthatdoesnotappearanywhere))' | |
632 |
|
632 | |||
633 |
|
633 | |||
634 | $ log 'merge()' |
|
634 | $ log 'merge()' | |
635 | 6 |
|
635 | 6 | |
636 | $ log 'branchpoint()' |
|
636 | $ log 'branchpoint()' | |
637 | 1 |
|
637 | 1 | |
638 | 4 |
|
638 | 4 | |
639 | $ log 'modifies(b)' |
|
639 | $ log 'modifies(b)' | |
640 | 4 |
|
640 | 4 | |
641 | $ log 'modifies("path:b")' |
|
641 | $ log 'modifies("path:b")' | |
642 | 4 |
|
642 | 4 | |
643 | $ log 'modifies("*")' |
|
643 | $ log 'modifies("*")' | |
644 | 4 |
|
644 | 4 | |
645 | 6 |
|
645 | 6 | |
646 | $ log 'modifies("set:modified()")' |
|
646 | $ log 'modifies("set:modified()")' | |
647 | 4 |
|
647 | 4 | |
648 | $ log 'id(5)' |
|
648 | $ log 'id(5)' | |
649 | 2 |
|
649 | 2 | |
650 | $ log 'only(9)' |
|
650 | $ log 'only(9)' | |
651 | 8 |
|
651 | 8 | |
652 | 9 |
|
652 | 9 | |
653 | $ log 'only(8)' |
|
653 | $ log 'only(8)' | |
654 | 8 |
|
654 | 8 | |
655 | $ log 'only(9, 5)' |
|
655 | $ log 'only(9, 5)' | |
656 | 2 |
|
656 | 2 | |
657 | 4 |
|
657 | 4 | |
658 | 8 |
|
658 | 8 | |
659 | 9 |
|
659 | 9 | |
660 | $ log 'only(7 + 9, 5 + 2)' |
|
660 | $ log 'only(7 + 9, 5 + 2)' | |
661 | 4 |
|
661 | 4 | |
662 | 6 |
|
662 | 6 | |
663 | 7 |
|
663 | 7 | |
664 | 8 |
|
664 | 8 | |
665 | 9 |
|
665 | 9 | |
666 |
|
666 | |||
667 | Test empty set input |
|
667 | Test empty set input | |
668 | $ log 'only(p2())' |
|
668 | $ log 'only(p2())' | |
669 | $ log 'only(p1(), p2())' |
|
669 | $ log 'only(p1(), p2())' | |
670 | 0 |
|
670 | 0 | |
671 | 1 |
|
671 | 1 | |
672 | 2 |
|
672 | 2 | |
673 | 4 |
|
673 | 4 | |
674 | 8 |
|
674 | 8 | |
675 | 9 |
|
675 | 9 | |
676 |
|
676 | |||
677 | Test '%' operator |
|
677 | Test '%' operator | |
678 |
|
678 | |||
679 | $ log '9%' |
|
679 | $ log '9%' | |
680 | 8 |
|
680 | 8 | |
681 | 9 |
|
681 | 9 | |
682 | $ log '9%5' |
|
682 | $ log '9%5' | |
683 | 2 |
|
683 | 2 | |
684 | 4 |
|
684 | 4 | |
685 | 8 |
|
685 | 8 | |
686 | 9 |
|
686 | 9 | |
687 | $ log '(7 + 9)%(5 + 2)' |
|
687 | $ log '(7 + 9)%(5 + 2)' | |
688 | 4 |
|
688 | 4 | |
689 | 6 |
|
689 | 6 | |
690 | 7 |
|
690 | 7 | |
691 | 8 |
|
691 | 8 | |
692 | 9 |
|
692 | 9 | |
693 |
|
693 | |||
694 | Test opreand of '%' is optimized recursively (issue4670) |
|
694 | Test opreand of '%' is optimized recursively (issue4670) | |
695 |
|
695 | |||
696 | $ try --optimize '8:9-8%' |
|
696 | $ try --optimize '8:9-8%' | |
697 | (onlypost |
|
697 | (onlypost | |
698 | (minus |
|
698 | (minus | |
699 | (range |
|
699 | (range | |
700 | ('symbol', '8') |
|
700 | ('symbol', '8') | |
701 | ('symbol', '9')) |
|
701 | ('symbol', '9')) | |
702 | ('symbol', '8'))) |
|
702 | ('symbol', '8'))) | |
703 | * optimized: |
|
703 | * optimized: | |
704 | (func |
|
704 | (func | |
705 | ('symbol', 'only') |
|
705 | ('symbol', 'only') | |
706 | (difference |
|
706 | (difference | |
707 | (range |
|
707 | (range | |
708 | ('symbol', '8') |
|
708 | ('symbol', '8') | |
709 | ('symbol', '9')) |
|
709 | ('symbol', '9')) | |
710 | ('symbol', '8'))) |
|
710 | ('symbol', '8'))) | |
711 | * set: |
|
711 | * set: | |
712 | <baseset+ [8, 9]> |
|
712 | <baseset+ [8, 9]> | |
713 | 8 |
|
713 | 8 | |
714 | 9 |
|
714 | 9 | |
715 | $ try --optimize '(9)%(5)' |
|
715 | $ try --optimize '(9)%(5)' | |
716 | (only |
|
716 | (only | |
717 | (group |
|
717 | (group | |
718 | ('symbol', '9')) |
|
718 | ('symbol', '9')) | |
719 | (group |
|
719 | (group | |
720 | ('symbol', '5'))) |
|
720 | ('symbol', '5'))) | |
721 | * optimized: |
|
721 | * optimized: | |
722 | (func |
|
722 | (func | |
723 | ('symbol', 'only') |
|
723 | ('symbol', 'only') | |
724 | (list |
|
724 | (list | |
725 | ('symbol', '9') |
|
725 | ('symbol', '9') | |
726 | ('symbol', '5'))) |
|
726 | ('symbol', '5'))) | |
727 | * set: |
|
727 | * set: | |
728 | <baseset+ [2, 4, 8, 9]> |
|
728 | <baseset+ [2, 4, 8, 9]> | |
729 | 2 |
|
729 | 2 | |
730 | 4 |
|
730 | 4 | |
731 | 8 |
|
731 | 8 | |
732 | 9 |
|
732 | 9 | |
733 |
|
733 | |||
734 | Test the order of operations |
|
734 | Test the order of operations | |
735 |
|
735 | |||
736 | $ log '7 + 9%5 + 2' |
|
736 | $ log '7 + 9%5 + 2' | |
737 | 7 |
|
737 | 7 | |
738 | 2 |
|
738 | 2 | |
739 | 4 |
|
739 | 4 | |
740 | 8 |
|
740 | 8 | |
741 | 9 |
|
741 | 9 | |
742 |
|
742 | |||
743 | Test explicit numeric revision |
|
743 | Test explicit numeric revision | |
744 | $ log 'rev(-2)' |
|
744 | $ log 'rev(-2)' | |
745 | $ log 'rev(-1)' |
|
745 | $ log 'rev(-1)' | |
746 | -1 |
|
746 | -1 | |
747 | $ log 'rev(0)' |
|
747 | $ log 'rev(0)' | |
748 | 0 |
|
748 | 0 | |
749 | $ log 'rev(9)' |
|
749 | $ log 'rev(9)' | |
750 | 9 |
|
750 | 9 | |
751 | $ log 'rev(10)' |
|
751 | $ log 'rev(10)' | |
752 | $ log 'rev(tip)' |
|
752 | $ log 'rev(tip)' | |
753 | hg: parse error: rev expects a number |
|
753 | hg: parse error: rev expects a number | |
754 | [255] |
|
754 | [255] | |
755 |
|
755 | |||
756 | Test hexadecimal revision |
|
756 | Test hexadecimal revision | |
757 | $ log 'id(2)' |
|
757 | $ log 'id(2)' | |
758 | abort: 00changelog.i@2: ambiguous identifier! |
|
758 | abort: 00changelog.i@2: ambiguous identifier! | |
759 | [255] |
|
759 | [255] | |
760 | $ log 'id(23268)' |
|
760 | $ log 'id(23268)' | |
761 | 4 |
|
761 | 4 | |
762 | $ log 'id(2785f51eece)' |
|
762 | $ log 'id(2785f51eece)' | |
763 | 0 |
|
763 | 0 | |
764 | $ log 'id(d5d0dcbdc4d9ff5dbb2d336f32f0bb561c1a532c)' |
|
764 | $ log 'id(d5d0dcbdc4d9ff5dbb2d336f32f0bb561c1a532c)' | |
765 | 8 |
|
765 | 8 | |
766 | $ log 'id(d5d0dcbdc4a)' |
|
766 | $ log 'id(d5d0dcbdc4a)' | |
767 | $ log 'id(d5d0dcbdc4w)' |
|
767 | $ log 'id(d5d0dcbdc4w)' | |
768 | $ log 'id(d5d0dcbdc4d9ff5dbb2d336f32f0bb561c1a532d)' |
|
768 | $ log 'id(d5d0dcbdc4d9ff5dbb2d336f32f0bb561c1a532d)' | |
769 | $ log 'id(d5d0dcbdc4d9ff5dbb2d336f32f0bb561c1a532q)' |
|
769 | $ log 'id(d5d0dcbdc4d9ff5dbb2d336f32f0bb561c1a532q)' | |
770 | $ log 'id(1.0)' |
|
770 | $ log 'id(1.0)' | |
771 | $ log 'id(xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)' |
|
771 | $ log 'id(xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)' | |
772 |
|
772 | |||
773 | Test null revision |
|
773 | Test null revision | |
774 | $ log '(null)' |
|
774 | $ log '(null)' | |
775 | -1 |
|
775 | -1 | |
776 | $ log '(null:0)' |
|
776 | $ log '(null:0)' | |
777 | -1 |
|
777 | -1 | |
778 | 0 |
|
778 | 0 | |
779 | $ log '(0:null)' |
|
779 | $ log '(0:null)' | |
780 | 0 |
|
780 | 0 | |
781 | -1 |
|
781 | -1 | |
782 | $ log 'null::0' |
|
782 | $ log 'null::0' | |
783 | -1 |
|
783 | -1 | |
784 | 0 |
|
784 | 0 | |
785 | $ log 'null:tip - 0:' |
|
785 | $ log 'null:tip - 0:' | |
786 | -1 |
|
786 | -1 | |
787 | $ log 'null: and null::' | head -1 |
|
787 | $ log 'null: and null::' | head -1 | |
788 | -1 |
|
788 | -1 | |
789 | $ log 'null: or 0:' | head -2 |
|
789 | $ log 'null: or 0:' | head -2 | |
790 | -1 |
|
790 | -1 | |
791 | 0 |
|
791 | 0 | |
792 | $ log 'ancestors(null)' |
|
792 | $ log 'ancestors(null)' | |
793 | -1 |
|
793 | -1 | |
794 | $ log 'reverse(null:)' | tail -2 |
|
794 | $ log 'reverse(null:)' | tail -2 | |
795 | 0 |
|
795 | 0 | |
796 | -1 |
|
796 | -1 | |
797 | BROKEN: should be '-1' |
|
797 | BROKEN: should be '-1' | |
798 | $ log 'first(null:)' |
|
798 | $ log 'first(null:)' | |
799 | BROKEN: should be '-1' |
|
799 | BROKEN: should be '-1' | |
800 | $ log 'min(null:)' |
|
800 | $ log 'min(null:)' | |
801 | $ log 'tip:null and all()' | tail -2 |
|
801 | $ log 'tip:null and all()' | tail -2 | |
802 | 1 |
|
802 | 1 | |
803 | 0 |
|
803 | 0 | |
804 |
|
804 | |||
805 | Test working-directory revision |
|
805 | Test working-directory revision | |
806 | $ hg debugrevspec 'wdir()' |
|
806 | $ hg debugrevspec 'wdir()' | |
807 | 2147483647 |
|
807 | 2147483647 | |
808 | $ hg debugrevspec 'tip or wdir()' |
|
808 | $ hg debugrevspec 'tip or wdir()' | |
809 | 9 |
|
809 | 9 | |
810 | 2147483647 |
|
810 | 2147483647 | |
811 | $ hg debugrevspec '0:tip and wdir()' |
|
811 | $ hg debugrevspec '0:tip and wdir()' | |
812 | $ log '0:wdir()' | tail -3 |
|
812 | $ log '0:wdir()' | tail -3 | |
813 | 8 |
|
813 | 8 | |
814 | 9 |
|
814 | 9 | |
815 | 2147483647 |
|
815 | 2147483647 | |
816 | $ log 'wdir():0' | head -3 |
|
816 | $ log 'wdir():0' | head -3 | |
817 | 2147483647 |
|
817 | 2147483647 | |
818 | 9 |
|
818 | 9 | |
819 | 8 |
|
819 | 8 | |
820 | $ log 'wdir():wdir()' |
|
820 | $ log 'wdir():wdir()' | |
821 | 2147483647 |
|
821 | 2147483647 | |
822 | $ log '(all() + wdir()) & min(. + wdir())' |
|
822 | $ log '(all() + wdir()) & min(. + wdir())' | |
823 | 9 |
|
823 | 9 | |
824 | $ log '(all() + wdir()) & max(. + wdir())' |
|
824 | $ log '(all() + wdir()) & max(. + wdir())' | |
825 | 2147483647 |
|
825 | 2147483647 | |
826 | $ log '(all() + wdir()) & first(wdir() + .)' |
|
826 | $ log '(all() + wdir()) & first(wdir() + .)' | |
827 | 2147483647 |
|
827 | 2147483647 | |
828 | $ log '(all() + wdir()) & last(. + wdir())' |
|
828 | $ log '(all() + wdir()) & last(. + wdir())' | |
829 | 2147483647 |
|
829 | 2147483647 | |
830 |
|
830 | |||
831 | $ log 'outgoing()' |
|
831 | $ log 'outgoing()' | |
832 | 8 |
|
832 | 8 | |
833 | 9 |
|
833 | 9 | |
834 | $ log 'outgoing("../remote1")' |
|
834 | $ log 'outgoing("../remote1")' | |
835 | 8 |
|
835 | 8 | |
836 | 9 |
|
836 | 9 | |
837 | $ log 'outgoing("../remote2")' |
|
837 | $ log 'outgoing("../remote2")' | |
838 | 3 |
|
838 | 3 | |
839 | 5 |
|
839 | 5 | |
840 | 6 |
|
840 | 6 | |
841 | 7 |
|
841 | 7 | |
842 | 9 |
|
842 | 9 | |
843 | $ log 'p1(merge())' |
|
843 | $ log 'p1(merge())' | |
844 | 5 |
|
844 | 5 | |
845 | $ log 'p2(merge())' |
|
845 | $ log 'p2(merge())' | |
846 | 4 |
|
846 | 4 | |
847 | $ log 'parents(merge())' |
|
847 | $ log 'parents(merge())' | |
848 | 4 |
|
848 | 4 | |
849 | 5 |
|
849 | 5 | |
850 | $ log 'p1(branchpoint())' |
|
850 | $ log 'p1(branchpoint())' | |
851 | 0 |
|
851 | 0 | |
852 | 2 |
|
852 | 2 | |
853 | $ log 'p2(branchpoint())' |
|
853 | $ log 'p2(branchpoint())' | |
854 | $ log 'parents(branchpoint())' |
|
854 | $ log 'parents(branchpoint())' | |
855 | 0 |
|
855 | 0 | |
856 | 2 |
|
856 | 2 | |
857 | $ log 'removes(a)' |
|
857 | $ log 'removes(a)' | |
858 | 2 |
|
858 | 2 | |
859 | 6 |
|
859 | 6 | |
860 | $ log 'roots(all())' |
|
860 | $ log 'roots(all())' | |
861 | 0 |
|
861 | 0 | |
862 | $ log 'reverse(2 or 3 or 4 or 5)' |
|
862 | $ log 'reverse(2 or 3 or 4 or 5)' | |
863 | 5 |
|
863 | 5 | |
864 | 4 |
|
864 | 4 | |
865 | 3 |
|
865 | 3 | |
866 | 2 |
|
866 | 2 | |
867 | $ log 'reverse(all())' |
|
867 | $ log 'reverse(all())' | |
868 | 9 |
|
868 | 9 | |
869 | 8 |
|
869 | 8 | |
870 | 7 |
|
870 | 7 | |
871 | 6 |
|
871 | 6 | |
872 | 5 |
|
872 | 5 | |
873 | 4 |
|
873 | 4 | |
874 | 3 |
|
874 | 3 | |
875 | 2 |
|
875 | 2 | |
876 | 1 |
|
876 | 1 | |
877 | 0 |
|
877 | 0 | |
878 | $ log 'reverse(all()) & filelog(b)' |
|
878 | $ log 'reverse(all()) & filelog(b)' | |
879 | 4 |
|
879 | 4 | |
880 | 1 |
|
880 | 1 | |
881 | $ log 'rev(5)' |
|
881 | $ log 'rev(5)' | |
882 | 5 |
|
882 | 5 | |
883 | $ log 'sort(limit(reverse(all()), 3))' |
|
883 | $ log 'sort(limit(reverse(all()), 3))' | |
884 | 7 |
|
884 | 7 | |
885 | 8 |
|
885 | 8 | |
886 | 9 |
|
886 | 9 | |
887 | $ log 'sort(2 or 3 or 4 or 5, date)' |
|
887 | $ log 'sort(2 or 3 or 4 or 5, date)' | |
888 | 2 |
|
888 | 2 | |
889 | 3 |
|
889 | 3 | |
890 | 5 |
|
890 | 5 | |
891 | 4 |
|
891 | 4 | |
892 | $ log 'tagged()' |
|
892 | $ log 'tagged()' | |
893 | 6 |
|
893 | 6 | |
894 | $ log 'tag()' |
|
894 | $ log 'tag()' | |
895 | 6 |
|
895 | 6 | |
896 | $ log 'tag(1.0)' |
|
896 | $ log 'tag(1.0)' | |
897 | 6 |
|
897 | 6 | |
898 | $ log 'tag(tip)' |
|
898 | $ log 'tag(tip)' | |
899 | 9 |
|
899 | 9 | |
900 |
|
900 | |||
901 | test sort revset |
|
901 | test sort revset | |
902 | -------------------------------------------- |
|
902 | -------------------------------------------- | |
903 |
|
903 | |||
904 | test when adding two unordered revsets |
|
904 | test when adding two unordered revsets | |
905 |
|
905 | |||
906 | $ log 'sort(keyword(issue) or modifies(b))' |
|
906 | $ log 'sort(keyword(issue) or modifies(b))' | |
907 | 4 |
|
907 | 4 | |
908 | 6 |
|
908 | 6 | |
909 |
|
909 | |||
910 | test when sorting a reversed collection in the same way it is |
|
910 | test when sorting a reversed collection in the same way it is | |
911 |
|
911 | |||
912 | $ log 'sort(reverse(all()), -rev)' |
|
912 | $ log 'sort(reverse(all()), -rev)' | |
913 | 9 |
|
913 | 9 | |
914 | 8 |
|
914 | 8 | |
915 | 7 |
|
915 | 7 | |
916 | 6 |
|
916 | 6 | |
917 | 5 |
|
917 | 5 | |
918 | 4 |
|
918 | 4 | |
919 | 3 |
|
919 | 3 | |
920 | 2 |
|
920 | 2 | |
921 | 1 |
|
921 | 1 | |
922 | 0 |
|
922 | 0 | |
923 |
|
923 | |||
924 | test when sorting a reversed collection |
|
924 | test when sorting a reversed collection | |
925 |
|
925 | |||
926 | $ log 'sort(reverse(all()), rev)' |
|
926 | $ log 'sort(reverse(all()), rev)' | |
927 | 0 |
|
927 | 0 | |
928 | 1 |
|
928 | 1 | |
929 | 2 |
|
929 | 2 | |
930 | 3 |
|
930 | 3 | |
931 | 4 |
|
931 | 4 | |
932 | 5 |
|
932 | 5 | |
933 | 6 |
|
933 | 6 | |
934 | 7 |
|
934 | 7 | |
935 | 8 |
|
935 | 8 | |
936 | 9 |
|
936 | 9 | |
937 |
|
937 | |||
938 |
|
938 | |||
939 | test sorting two sorted collections in different orders |
|
939 | test sorting two sorted collections in different orders | |
940 |
|
940 | |||
941 | $ log 'sort(outgoing() or reverse(removes(a)), rev)' |
|
941 | $ log 'sort(outgoing() or reverse(removes(a)), rev)' | |
942 | 2 |
|
942 | 2 | |
943 | 6 |
|
943 | 6 | |
944 | 8 |
|
944 | 8 | |
945 | 9 |
|
945 | 9 | |
946 |
|
946 | |||
947 | test sorting two sorted collections in different orders backwards |
|
947 | test sorting two sorted collections in different orders backwards | |
948 |
|
948 | |||
949 | $ log 'sort(outgoing() or reverse(removes(a)), -rev)' |
|
949 | $ log 'sort(outgoing() or reverse(removes(a)), -rev)' | |
950 | 9 |
|
950 | 9 | |
951 | 8 |
|
951 | 8 | |
952 | 6 |
|
952 | 6 | |
953 | 2 |
|
953 | 2 | |
954 |
|
954 | |||
955 | $ cd .. |
|
955 | $ cd .. | |
956 |
|
956 | |||
957 | test sorting by multiple keys including variable-length strings |
|
957 | test sorting by multiple keys including variable-length strings | |
958 |
|
958 | |||
959 | $ hg init sorting |
|
959 | $ hg init sorting | |
960 | $ cd sorting |
|
960 | $ cd sorting | |
961 | $ cat <<EOF >> .hg/hgrc |
|
961 | $ cat <<EOF >> .hg/hgrc | |
962 | > [ui] |
|
962 | > [ui] | |
963 | > logtemplate = '{rev} {branch|p5}{desc|p5}{author|p5}{date|hgdate}\n' |
|
963 | > logtemplate = '{rev} {branch|p5}{desc|p5}{author|p5}{date|hgdate}\n' | |
964 | > [templatealias] |
|
964 | > [templatealias] | |
965 | > p5(s) = pad(s, 5) |
|
965 | > p5(s) = pad(s, 5) | |
966 | > EOF |
|
966 | > EOF | |
967 | $ hg branch -qf b12 |
|
967 | $ hg branch -qf b12 | |
968 | $ hg ci -m m111 -u u112 -d '111 10800' |
|
968 | $ hg ci -m m111 -u u112 -d '111 10800' | |
969 | $ hg branch -qf b11 |
|
969 | $ hg branch -qf b11 | |
970 | $ hg ci -m m12 -u u111 -d '112 7200' |
|
970 | $ hg ci -m m12 -u u111 -d '112 7200' | |
971 | $ hg branch -qf b111 |
|
971 | $ hg branch -qf b111 | |
972 | $ hg ci -m m11 -u u12 -d '111 3600' |
|
972 | $ hg ci -m m11 -u u12 -d '111 3600' | |
973 | $ hg branch -qf b112 |
|
973 | $ hg branch -qf b112 | |
974 | $ hg ci -m m111 -u u11 -d '120 0' |
|
974 | $ hg ci -m m111 -u u11 -d '120 0' | |
975 | $ hg branch -qf b111 |
|
975 | $ hg branch -qf b111 | |
976 | $ hg ci -m m112 -u u111 -d '110 14400' |
|
976 | $ hg ci -m m112 -u u111 -d '110 14400' | |
977 | created new head |
|
977 | created new head | |
978 |
|
978 | |||
979 | compare revisions (has fast path): |
|
979 | compare revisions (has fast path): | |
980 |
|
980 | |||
981 | $ hg log -r 'sort(all(), rev)' |
|
981 | $ hg log -r 'sort(all(), rev)' | |
982 | 0 b12 m111 u112 111 10800 |
|
982 | 0 b12 m111 u112 111 10800 | |
983 | 1 b11 m12 u111 112 7200 |
|
983 | 1 b11 m12 u111 112 7200 | |
984 | 2 b111 m11 u12 111 3600 |
|
984 | 2 b111 m11 u12 111 3600 | |
985 | 3 b112 m111 u11 120 0 |
|
985 | 3 b112 m111 u11 120 0 | |
986 | 4 b111 m112 u111 110 14400 |
|
986 | 4 b111 m112 u111 110 14400 | |
987 |
|
987 | |||
988 | $ hg log -r 'sort(all(), -rev)' |
|
988 | $ hg log -r 'sort(all(), -rev)' | |
989 | 4 b111 m112 u111 110 14400 |
|
989 | 4 b111 m112 u111 110 14400 | |
990 | 3 b112 m111 u11 120 0 |
|
990 | 3 b112 m111 u11 120 0 | |
991 | 2 b111 m11 u12 111 3600 |
|
991 | 2 b111 m11 u12 111 3600 | |
992 | 1 b11 m12 u111 112 7200 |
|
992 | 1 b11 m12 u111 112 7200 | |
993 | 0 b12 m111 u112 111 10800 |
|
993 | 0 b12 m111 u112 111 10800 | |
994 |
|
994 | |||
995 | compare variable-length strings (issue5218): |
|
995 | compare variable-length strings (issue5218): | |
996 |
|
996 | |||
997 | $ hg log -r 'sort(all(), branch)' |
|
997 | $ hg log -r 'sort(all(), branch)' | |
998 | 1 b11 m12 u111 112 7200 |
|
998 | 1 b11 m12 u111 112 7200 | |
999 | 2 b111 m11 u12 111 3600 |
|
999 | 2 b111 m11 u12 111 3600 | |
1000 | 4 b111 m112 u111 110 14400 |
|
1000 | 4 b111 m112 u111 110 14400 | |
1001 | 3 b112 m111 u11 120 0 |
|
1001 | 3 b112 m111 u11 120 0 | |
1002 | 0 b12 m111 u112 111 10800 |
|
1002 | 0 b12 m111 u112 111 10800 | |
1003 |
|
1003 | |||
1004 | $ hg log -r 'sort(all(), -branch)' |
|
1004 | $ hg log -r 'sort(all(), -branch)' | |
1005 | 0 b12 m111 u112 111 10800 |
|
1005 | 0 b12 m111 u112 111 10800 | |
1006 | 3 b112 m111 u11 120 0 |
|
1006 | 3 b112 m111 u11 120 0 | |
1007 | 2 b111 m11 u12 111 3600 |
|
1007 | 2 b111 m11 u12 111 3600 | |
1008 | 4 b111 m112 u111 110 14400 |
|
1008 | 4 b111 m112 u111 110 14400 | |
1009 | 1 b11 m12 u111 112 7200 |
|
1009 | 1 b11 m12 u111 112 7200 | |
1010 |
|
1010 | |||
1011 | $ hg log -r 'sort(all(), desc)' |
|
1011 | $ hg log -r 'sort(all(), desc)' | |
1012 | 2 b111 m11 u12 111 3600 |
|
1012 | 2 b111 m11 u12 111 3600 | |
1013 | 0 b12 m111 u112 111 10800 |
|
1013 | 0 b12 m111 u112 111 10800 | |
1014 | 3 b112 m111 u11 120 0 |
|
1014 | 3 b112 m111 u11 120 0 | |
1015 | 4 b111 m112 u111 110 14400 |
|
1015 | 4 b111 m112 u111 110 14400 | |
1016 | 1 b11 m12 u111 112 7200 |
|
1016 | 1 b11 m12 u111 112 7200 | |
1017 |
|
1017 | |||
1018 | $ hg log -r 'sort(all(), -desc)' |
|
1018 | $ hg log -r 'sort(all(), -desc)' | |
1019 | 1 b11 m12 u111 112 7200 |
|
1019 | 1 b11 m12 u111 112 7200 | |
1020 | 4 b111 m112 u111 110 14400 |
|
1020 | 4 b111 m112 u111 110 14400 | |
1021 | 0 b12 m111 u112 111 10800 |
|
1021 | 0 b12 m111 u112 111 10800 | |
1022 | 3 b112 m111 u11 120 0 |
|
1022 | 3 b112 m111 u11 120 0 | |
1023 | 2 b111 m11 u12 111 3600 |
|
1023 | 2 b111 m11 u12 111 3600 | |
1024 |
|
1024 | |||
1025 | $ hg log -r 'sort(all(), user)' |
|
1025 | $ hg log -r 'sort(all(), user)' | |
1026 | 3 b112 m111 u11 120 0 |
|
1026 | 3 b112 m111 u11 120 0 | |
1027 | 1 b11 m12 u111 112 7200 |
|
1027 | 1 b11 m12 u111 112 7200 | |
1028 | 4 b111 m112 u111 110 14400 |
|
1028 | 4 b111 m112 u111 110 14400 | |
1029 | 0 b12 m111 u112 111 10800 |
|
1029 | 0 b12 m111 u112 111 10800 | |
1030 | 2 b111 m11 u12 111 3600 |
|
1030 | 2 b111 m11 u12 111 3600 | |
1031 |
|
1031 | |||
1032 | $ hg log -r 'sort(all(), -user)' |
|
1032 | $ hg log -r 'sort(all(), -user)' | |
1033 | 2 b111 m11 u12 111 3600 |
|
1033 | 2 b111 m11 u12 111 3600 | |
1034 | 0 b12 m111 u112 111 10800 |
|
1034 | 0 b12 m111 u112 111 10800 | |
1035 | 1 b11 m12 u111 112 7200 |
|
1035 | 1 b11 m12 u111 112 7200 | |
1036 | 4 b111 m112 u111 110 14400 |
|
1036 | 4 b111 m112 u111 110 14400 | |
1037 | 3 b112 m111 u11 120 0 |
|
1037 | 3 b112 m111 u11 120 0 | |
1038 |
|
1038 | |||
1039 | compare dates (tz offset should have no effect): |
|
1039 | compare dates (tz offset should have no effect): | |
1040 |
|
1040 | |||
1041 | $ hg log -r 'sort(all(), date)' |
|
1041 | $ hg log -r 'sort(all(), date)' | |
1042 | 4 b111 m112 u111 110 14400 |
|
1042 | 4 b111 m112 u111 110 14400 | |
1043 | 0 b12 m111 u112 111 10800 |
|
1043 | 0 b12 m111 u112 111 10800 | |
1044 | 2 b111 m11 u12 111 3600 |
|
1044 | 2 b111 m11 u12 111 3600 | |
1045 | 1 b11 m12 u111 112 7200 |
|
1045 | 1 b11 m12 u111 112 7200 | |
1046 | 3 b112 m111 u11 120 0 |
|
1046 | 3 b112 m111 u11 120 0 | |
1047 |
|
1047 | |||
1048 | $ hg log -r 'sort(all(), -date)' |
|
1048 | $ hg log -r 'sort(all(), -date)' | |
1049 | 3 b112 m111 u11 120 0 |
|
1049 | 3 b112 m111 u11 120 0 | |
1050 | 1 b11 m12 u111 112 7200 |
|
1050 | 1 b11 m12 u111 112 7200 | |
1051 | 0 b12 m111 u112 111 10800 |
|
1051 | 0 b12 m111 u112 111 10800 | |
1052 | 2 b111 m11 u12 111 3600 |
|
1052 | 2 b111 m11 u12 111 3600 | |
1053 | 4 b111 m112 u111 110 14400 |
|
1053 | 4 b111 m112 u111 110 14400 | |
1054 |
|
1054 | |||
1055 | be aware that 'sort(x, -k)' is not exactly the same as 'reverse(sort(x, k))' |
|
1055 | be aware that 'sort(x, -k)' is not exactly the same as 'reverse(sort(x, k))' | |
1056 | because '-k' reverses the comparison, not the list itself: |
|
1056 | because '-k' reverses the comparison, not the list itself: | |
1057 |
|
1057 | |||
1058 | $ hg log -r 'sort(0 + 2, date)' |
|
1058 | $ hg log -r 'sort(0 + 2, date)' | |
1059 | 0 b12 m111 u112 111 10800 |
|
1059 | 0 b12 m111 u112 111 10800 | |
1060 | 2 b111 m11 u12 111 3600 |
|
1060 | 2 b111 m11 u12 111 3600 | |
1061 |
|
1061 | |||
1062 | $ hg log -r 'sort(0 + 2, -date)' |
|
1062 | $ hg log -r 'sort(0 + 2, -date)' | |
1063 | 0 b12 m111 u112 111 10800 |
|
1063 | 0 b12 m111 u112 111 10800 | |
1064 | 2 b111 m11 u12 111 3600 |
|
1064 | 2 b111 m11 u12 111 3600 | |
1065 |
|
1065 | |||
1066 | $ hg log -r 'reverse(sort(0 + 2, date))' |
|
1066 | $ hg log -r 'reverse(sort(0 + 2, date))' | |
1067 | 2 b111 m11 u12 111 3600 |
|
1067 | 2 b111 m11 u12 111 3600 | |
1068 | 0 b12 m111 u112 111 10800 |
|
1068 | 0 b12 m111 u112 111 10800 | |
1069 |
|
1069 | |||
1070 | sort by multiple keys: |
|
1070 | sort by multiple keys: | |
1071 |
|
1071 | |||
1072 | $ hg log -r 'sort(all(), "branch -rev")' |
|
1072 | $ hg log -r 'sort(all(), "branch -rev")' | |
1073 | 1 b11 m12 u111 112 7200 |
|
1073 | 1 b11 m12 u111 112 7200 | |
1074 | 4 b111 m112 u111 110 14400 |
|
1074 | 4 b111 m112 u111 110 14400 | |
1075 | 2 b111 m11 u12 111 3600 |
|
1075 | 2 b111 m11 u12 111 3600 | |
1076 | 3 b112 m111 u11 120 0 |
|
1076 | 3 b112 m111 u11 120 0 | |
1077 | 0 b12 m111 u112 111 10800 |
|
1077 | 0 b12 m111 u112 111 10800 | |
1078 |
|
1078 | |||
1079 | $ hg log -r 'sort(all(), "-desc -date")' |
|
1079 | $ hg log -r 'sort(all(), "-desc -date")' | |
1080 | 1 b11 m12 u111 112 7200 |
|
1080 | 1 b11 m12 u111 112 7200 | |
1081 | 4 b111 m112 u111 110 14400 |
|
1081 | 4 b111 m112 u111 110 14400 | |
1082 | 3 b112 m111 u11 120 0 |
|
1082 | 3 b112 m111 u11 120 0 | |
1083 | 0 b12 m111 u112 111 10800 |
|
1083 | 0 b12 m111 u112 111 10800 | |
1084 | 2 b111 m11 u12 111 3600 |
|
1084 | 2 b111 m11 u12 111 3600 | |
1085 |
|
1085 | |||
1086 | $ hg log -r 'sort(all(), "user -branch date rev")' |
|
1086 | $ hg log -r 'sort(all(), "user -branch date rev")' | |
1087 | 3 b112 m111 u11 120 0 |
|
1087 | 3 b112 m111 u11 120 0 | |
1088 | 4 b111 m112 u111 110 14400 |
|
1088 | 4 b111 m112 u111 110 14400 | |
1089 | 1 b11 m12 u111 112 7200 |
|
1089 | 1 b11 m12 u111 112 7200 | |
1090 | 0 b12 m111 u112 111 10800 |
|
1090 | 0 b12 m111 u112 111 10800 | |
1091 | 2 b111 m11 u12 111 3600 |
|
1091 | 2 b111 m11 u12 111 3600 | |
1092 |
|
1092 | |||
1093 | $ cd .. |
|
1093 | $ cd .. | |
1094 | $ cd repo |
|
1094 | $ cd repo | |
1095 |
|
1095 | |||
1096 | test subtracting something from an addset |
|
1096 | test subtracting something from an addset | |
1097 |
|
1097 | |||
1098 | $ log '(outgoing() or removes(a)) - removes(a)' |
|
1098 | $ log '(outgoing() or removes(a)) - removes(a)' | |
1099 | 8 |
|
1099 | 8 | |
1100 | 9 |
|
1100 | 9 | |
1101 |
|
1101 | |||
1102 | test intersecting something with an addset |
|
1102 | test intersecting something with an addset | |
1103 |
|
1103 | |||
1104 | $ log 'parents(outgoing() or removes(a))' |
|
1104 | $ log 'parents(outgoing() or removes(a))' | |
1105 | 1 |
|
1105 | 1 | |
1106 | 4 |
|
1106 | 4 | |
1107 | 5 |
|
1107 | 5 | |
1108 | 8 |
|
1108 | 8 | |
1109 |
|
1109 | |||
1110 | test that `or` operation combines elements in the right order: |
|
1110 | test that `or` operation combines elements in the right order: | |
1111 |
|
1111 | |||
1112 | $ log '3:4 or 2:5' |
|
1112 | $ log '3:4 or 2:5' | |
1113 | 3 |
|
1113 | 3 | |
1114 | 4 |
|
1114 | 4 | |
1115 | 2 |
|
1115 | 2 | |
1116 | 5 |
|
1116 | 5 | |
1117 | $ log '3:4 or 5:2' |
|
1117 | $ log '3:4 or 5:2' | |
1118 | 3 |
|
1118 | 3 | |
1119 | 4 |
|
1119 | 4 | |
1120 | 5 |
|
1120 | 5 | |
1121 | 2 |
|
1121 | 2 | |
1122 | $ log 'sort(3:4 or 2:5)' |
|
1122 | $ log 'sort(3:4 or 2:5)' | |
1123 | 2 |
|
1123 | 2 | |
1124 | 3 |
|
1124 | 3 | |
1125 | 4 |
|
1125 | 4 | |
1126 | 5 |
|
1126 | 5 | |
1127 | $ log 'sort(3:4 or 5:2)' |
|
1127 | $ log 'sort(3:4 or 5:2)' | |
1128 | 2 |
|
1128 | 2 | |
1129 | 3 |
|
1129 | 3 | |
1130 | 4 |
|
1130 | 4 | |
1131 | 5 |
|
1131 | 5 | |
1132 |
|
1132 | |||
1133 | test that more than one `-r`s are combined in the right order and deduplicated: |
|
1133 | test that more than one `-r`s are combined in the right order and deduplicated: | |
1134 |
|
1134 | |||
1135 | $ hg log -T '{rev}\n' -r 3 -r 3 -r 4 -r 5:2 -r 'ancestors(4)' |
|
1135 | $ hg log -T '{rev}\n' -r 3 -r 3 -r 4 -r 5:2 -r 'ancestors(4)' | |
1136 | 3 |
|
1136 | 3 | |
1137 | 4 |
|
1137 | 4 | |
1138 | 5 |
|
1138 | 5 | |
1139 | 2 |
|
1139 | 2 | |
1140 | 0 |
|
1140 | 0 | |
1141 | 1 |
|
1141 | 1 | |
1142 |
|
1142 | |||
1143 | test that `or` operation skips duplicated revisions from right-hand side |
|
1143 | test that `or` operation skips duplicated revisions from right-hand side | |
1144 |
|
1144 | |||
1145 | $ try 'reverse(1::5) or ancestors(4)' |
|
1145 | $ try 'reverse(1::5) or ancestors(4)' | |
1146 | (or |
|
1146 | (or | |
1147 | (func |
|
1147 | (func | |
1148 | ('symbol', 'reverse') |
|
1148 | ('symbol', 'reverse') | |
1149 | (dagrange |
|
1149 | (dagrange | |
1150 | ('symbol', '1') |
|
1150 | ('symbol', '1') | |
1151 | ('symbol', '5'))) |
|
1151 | ('symbol', '5'))) | |
1152 | (func |
|
1152 | (func | |
1153 | ('symbol', 'ancestors') |
|
1153 | ('symbol', 'ancestors') | |
1154 | ('symbol', '4'))) |
|
1154 | ('symbol', '4'))) | |
1155 | * set: |
|
1155 | * set: | |
1156 | <addset |
|
1156 | <addset | |
1157 | <baseset- [1, 3, 5]>, |
|
1157 | <baseset- [1, 3, 5]>, | |
1158 | <generatorset+>> |
|
1158 | <generatorset+>> | |
1159 | 5 |
|
1159 | 5 | |
1160 | 3 |
|
1160 | 3 | |
1161 | 1 |
|
1161 | 1 | |
1162 | 0 |
|
1162 | 0 | |
1163 | 2 |
|
1163 | 2 | |
1164 | 4 |
|
1164 | 4 | |
1165 | $ try 'sort(ancestors(4) or reverse(1::5))' |
|
1165 | $ try 'sort(ancestors(4) or reverse(1::5))' | |
1166 | (func |
|
1166 | (func | |
1167 | ('symbol', 'sort') |
|
1167 | ('symbol', 'sort') | |
1168 | (or |
|
1168 | (or | |
1169 | (func |
|
1169 | (func | |
1170 | ('symbol', 'ancestors') |
|
1170 | ('symbol', 'ancestors') | |
1171 | ('symbol', '4')) |
|
1171 | ('symbol', '4')) | |
1172 | (func |
|
1172 | (func | |
1173 | ('symbol', 'reverse') |
|
1173 | ('symbol', 'reverse') | |
1174 | (dagrange |
|
1174 | (dagrange | |
1175 | ('symbol', '1') |
|
1175 | ('symbol', '1') | |
1176 | ('symbol', '5'))))) |
|
1176 | ('symbol', '5'))))) | |
1177 | * set: |
|
1177 | * set: | |
1178 | <addset+ |
|
1178 | <addset+ | |
1179 | <generatorset+>, |
|
1179 | <generatorset+>, | |
1180 | <baseset- [1, 3, 5]>> |
|
1180 | <baseset- [1, 3, 5]>> | |
1181 | 0 |
|
1181 | 0 | |
1182 | 1 |
|
1182 | 1 | |
1183 | 2 |
|
1183 | 2 | |
1184 | 3 |
|
1184 | 3 | |
1185 | 4 |
|
1185 | 4 | |
1186 | 5 |
|
1186 | 5 | |
1187 |
|
1187 | |||
1188 | test optimization of trivial `or` operation |
|
1188 | test optimization of trivial `or` operation | |
1189 |
|
1189 | |||
1190 | $ try --optimize '0|(1)|"2"|-2|tip|null' |
|
1190 | $ try --optimize '0|(1)|"2"|-2|tip|null' | |
1191 | (or |
|
1191 | (or | |
1192 | ('symbol', '0') |
|
1192 | ('symbol', '0') | |
1193 | (group |
|
1193 | (group | |
1194 | ('symbol', '1')) |
|
1194 | ('symbol', '1')) | |
1195 | ('string', '2') |
|
1195 | ('string', '2') | |
1196 | (negate |
|
1196 | (negate | |
1197 | ('symbol', '2')) |
|
1197 | ('symbol', '2')) | |
1198 | ('symbol', 'tip') |
|
1198 | ('symbol', 'tip') | |
1199 | ('symbol', 'null')) |
|
1199 | ('symbol', 'null')) | |
1200 | * optimized: |
|
1200 | * optimized: | |
1201 | (func |
|
1201 | (func | |
1202 | ('symbol', '_list') |
|
1202 | ('symbol', '_list') | |
1203 | ('string', '0\x001\x002\x00-2\x00tip\x00null')) |
|
1203 | ('string', '0\x001\x002\x00-2\x00tip\x00null')) | |
1204 | * set: |
|
1204 | * set: | |
1205 | <baseset [0, 1, 2, 8, 9, -1]> |
|
1205 | <baseset [0, 1, 2, 8, 9, -1]> | |
1206 | 0 |
|
1206 | 0 | |
1207 | 1 |
|
1207 | 1 | |
1208 | 2 |
|
1208 | 2 | |
1209 | 8 |
|
1209 | 8 | |
1210 | 9 |
|
1210 | 9 | |
1211 | -1 |
|
1211 | -1 | |
1212 |
|
1212 | |||
1213 | $ try --optimize '0|1|2:3' |
|
1213 | $ try --optimize '0|1|2:3' | |
1214 | (or |
|
1214 | (or | |
1215 | ('symbol', '0') |
|
1215 | ('symbol', '0') | |
1216 | ('symbol', '1') |
|
1216 | ('symbol', '1') | |
1217 | (range |
|
1217 | (range | |
1218 | ('symbol', '2') |
|
1218 | ('symbol', '2') | |
1219 | ('symbol', '3'))) |
|
1219 | ('symbol', '3'))) | |
1220 | * optimized: |
|
1220 | * optimized: | |
1221 | (or |
|
1221 | (or | |
1222 | (func |
|
1222 | (func | |
1223 | ('symbol', '_list') |
|
1223 | ('symbol', '_list') | |
1224 | ('string', '0\x001')) |
|
1224 | ('string', '0\x001')) | |
1225 | (range |
|
1225 | (range | |
1226 | ('symbol', '2') |
|
1226 | ('symbol', '2') | |
1227 | ('symbol', '3'))) |
|
1227 | ('symbol', '3'))) | |
1228 | * set: |
|
1228 | * set: | |
1229 | <addset |
|
1229 | <addset | |
1230 | <baseset [0, 1]>, |
|
1230 | <baseset [0, 1]>, | |
1231 | <spanset+ 2:3>> |
|
1231 | <spanset+ 2:3>> | |
1232 | 0 |
|
1232 | 0 | |
1233 | 1 |
|
1233 | 1 | |
1234 | 2 |
|
1234 | 2 | |
1235 | 3 |
|
1235 | 3 | |
1236 |
|
1236 | |||
1237 | $ try --optimize '0:1|2|3:4|5|6' |
|
1237 | $ try --optimize '0:1|2|3:4|5|6' | |
1238 | (or |
|
1238 | (or | |
1239 | (range |
|
1239 | (range | |
1240 | ('symbol', '0') |
|
1240 | ('symbol', '0') | |
1241 | ('symbol', '1')) |
|
1241 | ('symbol', '1')) | |
1242 | ('symbol', '2') |
|
1242 | ('symbol', '2') | |
1243 | (range |
|
1243 | (range | |
1244 | ('symbol', '3') |
|
1244 | ('symbol', '3') | |
1245 | ('symbol', '4')) |
|
1245 | ('symbol', '4')) | |
1246 | ('symbol', '5') |
|
1246 | ('symbol', '5') | |
1247 | ('symbol', '6')) |
|
1247 | ('symbol', '6')) | |
1248 | * optimized: |
|
1248 | * optimized: | |
1249 | (or |
|
1249 | (or | |
1250 | (range |
|
1250 | (range | |
1251 | ('symbol', '0') |
|
1251 | ('symbol', '0') | |
1252 | ('symbol', '1')) |
|
1252 | ('symbol', '1')) | |
1253 | ('symbol', '2') |
|
1253 | ('symbol', '2') | |
1254 | (range |
|
1254 | (range | |
1255 | ('symbol', '3') |
|
1255 | ('symbol', '3') | |
1256 | ('symbol', '4')) |
|
1256 | ('symbol', '4')) | |
1257 | (func |
|
1257 | (func | |
1258 | ('symbol', '_list') |
|
1258 | ('symbol', '_list') | |
1259 | ('string', '5\x006'))) |
|
1259 | ('string', '5\x006'))) | |
1260 | * set: |
|
1260 | * set: | |
1261 | <addset |
|
1261 | <addset | |
1262 | <addset |
|
1262 | <addset | |
1263 | <spanset+ 0:1>, |
|
1263 | <spanset+ 0:1>, | |
1264 | <baseset [2]>>, |
|
1264 | <baseset [2]>>, | |
1265 | <addset |
|
1265 | <addset | |
1266 | <spanset+ 3:4>, |
|
1266 | <spanset+ 3:4>, | |
1267 | <baseset [5, 6]>>> |
|
1267 | <baseset [5, 6]>>> | |
1268 | 0 |
|
1268 | 0 | |
1269 | 1 |
|
1269 | 1 | |
1270 | 2 |
|
1270 | 2 | |
1271 | 3 |
|
1271 | 3 | |
1272 | 4 |
|
1272 | 4 | |
1273 | 5 |
|
1273 | 5 | |
1274 | 6 |
|
1274 | 6 | |
1275 |
|
1275 | |||
1276 | test that `_list` should be narrowed by provided `subset` |
|
1276 | test that `_list` should be narrowed by provided `subset` | |
1277 |
|
1277 | |||
1278 | $ log '0:2 and (null|1|2|3)' |
|
1278 | $ log '0:2 and (null|1|2|3)' | |
1279 | 1 |
|
1279 | 1 | |
1280 | 2 |
|
1280 | 2 | |
1281 |
|
1281 | |||
1282 | test that `_list` should remove duplicates |
|
1282 | test that `_list` should remove duplicates | |
1283 |
|
1283 | |||
1284 | $ log '0|1|2|1|2|-1|tip' |
|
1284 | $ log '0|1|2|1|2|-1|tip' | |
1285 | 0 |
|
1285 | 0 | |
1286 | 1 |
|
1286 | 1 | |
1287 | 2 |
|
1287 | 2 | |
1288 | 9 |
|
1288 | 9 | |
1289 |
|
1289 | |||
1290 | test unknown revision in `_list` |
|
1290 | test unknown revision in `_list` | |
1291 |
|
1291 | |||
1292 | $ log '0|unknown' |
|
1292 | $ log '0|unknown' | |
1293 | abort: unknown revision 'unknown'! |
|
1293 | abort: unknown revision 'unknown'! | |
1294 | [255] |
|
1294 | [255] | |
1295 |
|
1295 | |||
1296 | test integer range in `_list` |
|
1296 | test integer range in `_list` | |
1297 |
|
1297 | |||
1298 | $ log '-1|-10' |
|
1298 | $ log '-1|-10' | |
1299 | 9 |
|
1299 | 9 | |
1300 | 0 |
|
1300 | 0 | |
1301 |
|
1301 | |||
1302 | $ log '-10|-11' |
|
1302 | $ log '-10|-11' | |
1303 | abort: unknown revision '-11'! |
|
1303 | abort: unknown revision '-11'! | |
1304 | [255] |
|
1304 | [255] | |
1305 |
|
1305 | |||
1306 | $ log '9|10' |
|
1306 | $ log '9|10' | |
1307 | abort: unknown revision '10'! |
|
1307 | abort: unknown revision '10'! | |
1308 | [255] |
|
1308 | [255] | |
1309 |
|
1309 | |||
1310 | test '0000' != '0' in `_list` |
|
1310 | test '0000' != '0' in `_list` | |
1311 |
|
1311 | |||
1312 | $ log '0|0000' |
|
1312 | $ log '0|0000' | |
1313 | 0 |
|
1313 | 0 | |
1314 | -1 |
|
1314 | -1 | |
1315 |
|
1315 | |||
1316 | test ',' in `_list` |
|
1316 | test ',' in `_list` | |
1317 | $ log '0,1' |
|
1317 | $ log '0,1' | |
1318 | hg: parse error: can't use a list in this context |
|
1318 | hg: parse error: can't use a list in this context | |
1319 | (see hg help "revsets.x or y") |
|
1319 | (see hg help "revsets.x or y") | |
1320 | [255] |
|
1320 | [255] | |
1321 | $ try '0,1,2' |
|
1321 | $ try '0,1,2' | |
1322 | (list |
|
1322 | (list | |
1323 | ('symbol', '0') |
|
1323 | ('symbol', '0') | |
1324 | ('symbol', '1') |
|
1324 | ('symbol', '1') | |
1325 | ('symbol', '2')) |
|
1325 | ('symbol', '2')) | |
1326 | hg: parse error: can't use a list in this context |
|
1326 | hg: parse error: can't use a list in this context | |
1327 | (see hg help "revsets.x or y") |
|
1327 | (see hg help "revsets.x or y") | |
1328 | [255] |
|
1328 | [255] | |
1329 |
|
1329 | |||
1330 | test that chained `or` operations make balanced addsets |
|
1330 | test that chained `or` operations make balanced addsets | |
1331 |
|
1331 | |||
1332 | $ try '0:1|1:2|2:3|3:4|4:5' |
|
1332 | $ try '0:1|1:2|2:3|3:4|4:5' | |
1333 | (or |
|
1333 | (or | |
1334 | (range |
|
1334 | (range | |
1335 | ('symbol', '0') |
|
1335 | ('symbol', '0') | |
1336 | ('symbol', '1')) |
|
1336 | ('symbol', '1')) | |
1337 | (range |
|
1337 | (range | |
1338 | ('symbol', '1') |
|
1338 | ('symbol', '1') | |
1339 | ('symbol', '2')) |
|
1339 | ('symbol', '2')) | |
1340 | (range |
|
1340 | (range | |
1341 | ('symbol', '2') |
|
1341 | ('symbol', '2') | |
1342 | ('symbol', '3')) |
|
1342 | ('symbol', '3')) | |
1343 | (range |
|
1343 | (range | |
1344 | ('symbol', '3') |
|
1344 | ('symbol', '3') | |
1345 | ('symbol', '4')) |
|
1345 | ('symbol', '4')) | |
1346 | (range |
|
1346 | (range | |
1347 | ('symbol', '4') |
|
1347 | ('symbol', '4') | |
1348 | ('symbol', '5'))) |
|
1348 | ('symbol', '5'))) | |
1349 | * set: |
|
1349 | * set: | |
1350 | <addset |
|
1350 | <addset | |
1351 | <addset |
|
1351 | <addset | |
1352 | <spanset+ 0:1>, |
|
1352 | <spanset+ 0:1>, | |
1353 | <spanset+ 1:2>>, |
|
1353 | <spanset+ 1:2>>, | |
1354 | <addset |
|
1354 | <addset | |
1355 | <spanset+ 2:3>, |
|
1355 | <spanset+ 2:3>, | |
1356 | <addset |
|
1356 | <addset | |
1357 | <spanset+ 3:4>, |
|
1357 | <spanset+ 3:4>, | |
1358 | <spanset+ 4:5>>>> |
|
1358 | <spanset+ 4:5>>>> | |
1359 | 0 |
|
1359 | 0 | |
1360 | 1 |
|
1360 | 1 | |
1361 | 2 |
|
1361 | 2 | |
1362 | 3 |
|
1362 | 3 | |
1363 | 4 |
|
1363 | 4 | |
1364 | 5 |
|
1364 | 5 | |
1365 |
|
1365 | |||
1366 | no crash by empty group "()" while optimizing `or` operations |
|
1366 | no crash by empty group "()" while optimizing `or` operations | |
1367 |
|
1367 | |||
1368 | $ try --optimize '0|()' |
|
1368 | $ try --optimize '0|()' | |
1369 | (or |
|
1369 | (or | |
1370 | ('symbol', '0') |
|
1370 | ('symbol', '0') | |
1371 | (group |
|
1371 | (group | |
1372 | None)) |
|
1372 | None)) | |
1373 | * optimized: |
|
1373 | * optimized: | |
1374 | (or |
|
1374 | (or | |
1375 | ('symbol', '0') |
|
1375 | ('symbol', '0') | |
1376 | None) |
|
1376 | None) | |
1377 | hg: parse error: missing argument |
|
1377 | hg: parse error: missing argument | |
1378 | [255] |
|
1378 | [255] | |
1379 |
|
1379 | |||
1380 | test that chained `or` operations never eat up stack (issue4624) |
|
1380 | test that chained `or` operations never eat up stack (issue4624) | |
1381 | (uses `0:1` instead of `0` to avoid future optimization of trivial revisions) |
|
1381 | (uses `0:1` instead of `0` to avoid future optimization of trivial revisions) | |
1382 |
|
1382 | |||
1383 | $ hg log -T '{rev}\n' -r `python -c "print '+'.join(['0:1'] * 500)"` |
|
1383 | $ hg log -T '{rev}\n' -r `python -c "print '+'.join(['0:1'] * 500)"` | |
1384 | 0 |
|
1384 | 0 | |
1385 | 1 |
|
1385 | 1 | |
1386 |
|
1386 | |||
1387 | test that repeated `-r` options never eat up stack (issue4565) |
|
1387 | test that repeated `-r` options never eat up stack (issue4565) | |
1388 | (uses `-r 0::1` to avoid possible optimization at old-style parser) |
|
1388 | (uses `-r 0::1` to avoid possible optimization at old-style parser) | |
1389 |
|
1389 | |||
1390 | $ hg log -T '{rev}\n' `python -c "for i in xrange(500): print '-r 0::1 ',"` |
|
1390 | $ hg log -T '{rev}\n' `python -c "for i in xrange(500): print '-r 0::1 ',"` | |
1391 | 0 |
|
1391 | 0 | |
1392 | 1 |
|
1392 | 1 | |
1393 |
|
1393 | |||
1394 | check that conversion to only works |
|
1394 | check that conversion to only works | |
1395 | $ try --optimize '::3 - ::1' |
|
1395 | $ try --optimize '::3 - ::1' | |
1396 | (minus |
|
1396 | (minus | |
1397 | (dagrangepre |
|
1397 | (dagrangepre | |
1398 | ('symbol', '3')) |
|
1398 | ('symbol', '3')) | |
1399 | (dagrangepre |
|
1399 | (dagrangepre | |
1400 | ('symbol', '1'))) |
|
1400 | ('symbol', '1'))) | |
1401 | * optimized: |
|
1401 | * optimized: | |
1402 | (func |
|
1402 | (func | |
1403 | ('symbol', 'only') |
|
1403 | ('symbol', 'only') | |
1404 | (list |
|
1404 | (list | |
1405 | ('symbol', '3') |
|
1405 | ('symbol', '3') | |
1406 | ('symbol', '1'))) |
|
1406 | ('symbol', '1'))) | |
1407 | * set: |
|
1407 | * set: | |
1408 | <baseset+ [3]> |
|
1408 | <baseset+ [3]> | |
1409 | 3 |
|
1409 | 3 | |
1410 | $ try --optimize 'ancestors(1) - ancestors(3)' |
|
1410 | $ try --optimize 'ancestors(1) - ancestors(3)' | |
1411 | (minus |
|
1411 | (minus | |
1412 | (func |
|
1412 | (func | |
1413 | ('symbol', 'ancestors') |
|
1413 | ('symbol', 'ancestors') | |
1414 | ('symbol', '1')) |
|
1414 | ('symbol', '1')) | |
1415 | (func |
|
1415 | (func | |
1416 | ('symbol', 'ancestors') |
|
1416 | ('symbol', 'ancestors') | |
1417 | ('symbol', '3'))) |
|
1417 | ('symbol', '3'))) | |
1418 | * optimized: |
|
1418 | * optimized: | |
1419 | (func |
|
1419 | (func | |
1420 | ('symbol', 'only') |
|
1420 | ('symbol', 'only') | |
1421 | (list |
|
1421 | (list | |
1422 | ('symbol', '1') |
|
1422 | ('symbol', '1') | |
1423 | ('symbol', '3'))) |
|
1423 | ('symbol', '3'))) | |
1424 | * set: |
|
1424 | * set: | |
1425 | <baseset+ []> |
|
1425 | <baseset+ []> | |
1426 | $ try --optimize 'not ::2 and ::6' |
|
1426 | $ try --optimize 'not ::2 and ::6' | |
1427 | (and |
|
1427 | (and | |
1428 | (not |
|
1428 | (not | |
1429 | (dagrangepre |
|
1429 | (dagrangepre | |
1430 | ('symbol', '2'))) |
|
1430 | ('symbol', '2'))) | |
1431 | (dagrangepre |
|
1431 | (dagrangepre | |
1432 | ('symbol', '6'))) |
|
1432 | ('symbol', '6'))) | |
1433 | * optimized: |
|
1433 | * optimized: | |
1434 | (func |
|
1434 | (func | |
1435 | ('symbol', 'only') |
|
1435 | ('symbol', 'only') | |
1436 | (list |
|
1436 | (list | |
1437 | ('symbol', '6') |
|
1437 | ('symbol', '6') | |
1438 | ('symbol', '2'))) |
|
1438 | ('symbol', '2'))) | |
1439 | * set: |
|
1439 | * set: | |
1440 | <baseset+ [3, 4, 5, 6]> |
|
1440 | <baseset+ [3, 4, 5, 6]> | |
1441 | 3 |
|
1441 | 3 | |
1442 | 4 |
|
1442 | 4 | |
1443 | 5 |
|
1443 | 5 | |
1444 | 6 |
|
1444 | 6 | |
1445 | $ try --optimize 'ancestors(6) and not ancestors(4)' |
|
1445 | $ try --optimize 'ancestors(6) and not ancestors(4)' | |
1446 | (and |
|
1446 | (and | |
1447 | (func |
|
1447 | (func | |
1448 | ('symbol', 'ancestors') |
|
1448 | ('symbol', 'ancestors') | |
1449 | ('symbol', '6')) |
|
1449 | ('symbol', '6')) | |
1450 | (not |
|
1450 | (not | |
1451 | (func |
|
1451 | (func | |
1452 | ('symbol', 'ancestors') |
|
1452 | ('symbol', 'ancestors') | |
1453 | ('symbol', '4')))) |
|
1453 | ('symbol', '4')))) | |
1454 | * optimized: |
|
1454 | * optimized: | |
1455 | (func |
|
1455 | (func | |
1456 | ('symbol', 'only') |
|
1456 | ('symbol', 'only') | |
1457 | (list |
|
1457 | (list | |
1458 | ('symbol', '6') |
|
1458 | ('symbol', '6') | |
1459 | ('symbol', '4'))) |
|
1459 | ('symbol', '4'))) | |
1460 | * set: |
|
1460 | * set: | |
1461 | <baseset+ [3, 5, 6]> |
|
1461 | <baseset+ [3, 5, 6]> | |
1462 | 3 |
|
1462 | 3 | |
1463 | 5 |
|
1463 | 5 | |
1464 | 6 |
|
1464 | 6 | |
1465 |
|
1465 | |||
1466 | no crash by empty group "()" while optimizing to "only()" |
|
1466 | no crash by empty group "()" while optimizing to "only()" | |
1467 |
|
1467 | |||
1468 | $ try --optimize '::1 and ()' |
|
1468 | $ try --optimize '::1 and ()' | |
1469 | (and |
|
1469 | (and | |
1470 | (dagrangepre |
|
1470 | (dagrangepre | |
1471 | ('symbol', '1')) |
|
1471 | ('symbol', '1')) | |
1472 | (group |
|
1472 | (group | |
1473 | None)) |
|
1473 | None)) | |
1474 | * optimized: |
|
1474 | * optimized: | |
1475 | (and |
|
1475 | (and | |
1476 | None |
|
1476 | None | |
1477 | (func |
|
1477 | (func | |
1478 | ('symbol', 'ancestors') |
|
1478 | ('symbol', 'ancestors') | |
1479 | ('symbol', '1'))) |
|
1479 | ('symbol', '1'))) | |
1480 | hg: parse error: missing argument |
|
1480 | hg: parse error: missing argument | |
1481 | [255] |
|
1481 | [255] | |
1482 |
|
1482 | |||
1483 | we can use patterns when searching for tags |
|
1483 | we can use patterns when searching for tags | |
1484 |
|
1484 | |||
1485 | $ log 'tag("1..*")' |
|
1485 | $ log 'tag("1..*")' | |
1486 | abort: tag '1..*' does not exist! |
|
1486 | abort: tag '1..*' does not exist! | |
1487 | [255] |
|
1487 | [255] | |
1488 | $ log 'tag("re:1..*")' |
|
1488 | $ log 'tag("re:1..*")' | |
1489 | 6 |
|
1489 | 6 | |
1490 | $ log 'tag("re:[0-9].[0-9]")' |
|
1490 | $ log 'tag("re:[0-9].[0-9]")' | |
1491 | 6 |
|
1491 | 6 | |
1492 | $ log 'tag("literal:1.0")' |
|
1492 | $ log 'tag("literal:1.0")' | |
1493 | 6 |
|
1493 | 6 | |
1494 | $ log 'tag("re:0..*")' |
|
1494 | $ log 'tag("re:0..*")' | |
1495 |
|
1495 | |||
1496 | $ log 'tag(unknown)' |
|
1496 | $ log 'tag(unknown)' | |
1497 | abort: tag 'unknown' does not exist! |
|
1497 | abort: tag 'unknown' does not exist! | |
1498 | [255] |
|
1498 | [255] | |
1499 | $ log 'tag("re:unknown")' |
|
1499 | $ log 'tag("re:unknown")' | |
1500 | $ log 'present(tag("unknown"))' |
|
1500 | $ log 'present(tag("unknown"))' | |
1501 | $ log 'present(tag("re:unknown"))' |
|
1501 | $ log 'present(tag("re:unknown"))' | |
1502 | $ log 'branch(unknown)' |
|
1502 | $ log 'branch(unknown)' | |
1503 | abort: unknown revision 'unknown'! |
|
1503 | abort: unknown revision 'unknown'! | |
1504 | [255] |
|
1504 | [255] | |
1505 | $ log 'branch("literal:unknown")' |
|
1505 | $ log 'branch("literal:unknown")' | |
1506 | abort: branch 'unknown' does not exist! |
|
1506 | abort: branch 'unknown' does not exist! | |
1507 | [255] |
|
1507 | [255] | |
1508 | $ log 'branch("re:unknown")' |
|
1508 | $ log 'branch("re:unknown")' | |
1509 | $ log 'present(branch("unknown"))' |
|
1509 | $ log 'present(branch("unknown"))' | |
1510 | $ log 'present(branch("re:unknown"))' |
|
1510 | $ log 'present(branch("re:unknown"))' | |
1511 | $ log 'user(bob)' |
|
1511 | $ log 'user(bob)' | |
1512 | 2 |
|
1512 | 2 | |
1513 |
|
1513 | |||
1514 | $ log '4::8' |
|
1514 | $ log '4::8' | |
1515 | 4 |
|
1515 | 4 | |
1516 | 8 |
|
1516 | 8 | |
1517 | $ log '4:8' |
|
1517 | $ log '4:8' | |
1518 | 4 |
|
1518 | 4 | |
1519 | 5 |
|
1519 | 5 | |
1520 | 6 |
|
1520 | 6 | |
1521 | 7 |
|
1521 | 7 | |
1522 | 8 |
|
1522 | 8 | |
1523 |
|
1523 | |||
1524 | $ log 'sort(!merge() & (modifies(b) | user(bob) | keyword(bug) | keyword(issue) & 1::9), "-date")' |
|
1524 | $ log 'sort(!merge() & (modifies(b) | user(bob) | keyword(bug) | keyword(issue) & 1::9), "-date")' | |
1525 | 4 |
|
1525 | 4 | |
1526 | 2 |
|
1526 | 2 | |
1527 | 5 |
|
1527 | 5 | |
1528 |
|
1528 | |||
1529 | $ log 'not 0 and 0:2' |
|
1529 | $ log 'not 0 and 0:2' | |
1530 | 1 |
|
1530 | 1 | |
1531 | 2 |
|
1531 | 2 | |
1532 | $ log 'not 1 and 0:2' |
|
1532 | $ log 'not 1 and 0:2' | |
1533 | 0 |
|
1533 | 0 | |
1534 | 2 |
|
1534 | 2 | |
1535 | $ log 'not 2 and 0:2' |
|
1535 | $ log 'not 2 and 0:2' | |
1536 | 0 |
|
1536 | 0 | |
1537 | 1 |
|
1537 | 1 | |
1538 | $ log '(1 and 2)::' |
|
1538 | $ log '(1 and 2)::' | |
1539 | $ log '(1 and 2):' |
|
1539 | $ log '(1 and 2):' | |
1540 | $ log '(1 and 2):3' |
|
1540 | $ log '(1 and 2):3' | |
1541 | $ log 'sort(head(), -rev)' |
|
1541 | $ log 'sort(head(), -rev)' | |
1542 | 9 |
|
1542 | 9 | |
1543 | 7 |
|
1543 | 7 | |
1544 | 6 |
|
1544 | 6 | |
1545 | 5 |
|
1545 | 5 | |
1546 | 4 |
|
1546 | 4 | |
1547 | 3 |
|
1547 | 3 | |
1548 | 2 |
|
1548 | 2 | |
1549 | 1 |
|
1549 | 1 | |
1550 | 0 |
|
1550 | 0 | |
1551 | $ log '4::8 - 8' |
|
1551 | $ log '4::8 - 8' | |
1552 | 4 |
|
1552 | 4 | |
1553 | $ log 'matching(1 or 2 or 3) and (2 or 3 or 1)' |
|
1553 | $ log 'matching(1 or 2 or 3) and (2 or 3 or 1)' | |
1554 | 2 |
|
1554 | 2 | |
1555 | 3 |
|
1555 | 3 | |
1556 | 1 |
|
1556 | 1 | |
1557 |
|
1557 | |||
1558 | $ log 'named("unknown")' |
|
1558 | $ log 'named("unknown")' | |
1559 | abort: namespace 'unknown' does not exist! |
|
1559 | abort: namespace 'unknown' does not exist! | |
1560 | [255] |
|
1560 | [255] | |
1561 | $ log 'named("re:unknown")' |
|
1561 | $ log 'named("re:unknown")' | |
1562 | abort: no namespace exists that match 'unknown'! |
|
1562 | abort: no namespace exists that match 'unknown'! | |
1563 | [255] |
|
1563 | [255] | |
1564 | $ log 'present(named("unknown"))' |
|
1564 | $ log 'present(named("unknown"))' | |
1565 | $ log 'present(named("re:unknown"))' |
|
1565 | $ log 'present(named("re:unknown"))' | |
1566 |
|
1566 | |||
1567 | $ log 'tag()' |
|
1567 | $ log 'tag()' | |
1568 | 6 |
|
1568 | 6 | |
1569 | $ log 'named("tags")' |
|
1569 | $ log 'named("tags")' | |
1570 | 6 |
|
1570 | 6 | |
1571 |
|
1571 | |||
1572 | issue2437 |
|
1572 | issue2437 | |
1573 |
|
1573 | |||
1574 | $ log '3 and p1(5)' |
|
1574 | $ log '3 and p1(5)' | |
1575 | 3 |
|
1575 | 3 | |
1576 | $ log '4 and p2(6)' |
|
1576 | $ log '4 and p2(6)' | |
1577 | 4 |
|
1577 | 4 | |
1578 | $ log '1 and parents(:2)' |
|
1578 | $ log '1 and parents(:2)' | |
1579 | 1 |
|
1579 | 1 | |
1580 | $ log '2 and children(1:)' |
|
1580 | $ log '2 and children(1:)' | |
1581 | 2 |
|
1581 | 2 | |
1582 | $ log 'roots(all()) or roots(all())' |
|
1582 | $ log 'roots(all()) or roots(all())' | |
1583 | 0 |
|
1583 | 0 | |
1584 | $ hg debugrevspec 'roots(all()) or roots(all())' |
|
1584 | $ hg debugrevspec 'roots(all()) or roots(all())' | |
1585 | 0 |
|
1585 | 0 | |
1586 | $ log 'heads(branch(Γ©)) or heads(branch(Γ©))' |
|
1586 | $ log 'heads(branch(Γ©)) or heads(branch(Γ©))' | |
1587 | 9 |
|
1587 | 9 | |
1588 | $ log 'ancestors(8) and (heads(branch("-a-b-c-")) or heads(branch(Γ©)))' |
|
1588 | $ log 'ancestors(8) and (heads(branch("-a-b-c-")) or heads(branch(Γ©)))' | |
1589 | 4 |
|
1589 | 4 | |
1590 |
|
1590 | |||
1591 | issue2654: report a parse error if the revset was not completely parsed |
|
1591 | issue2654: report a parse error if the revset was not completely parsed | |
1592 |
|
1592 | |||
1593 | $ log '1 OR 2' |
|
1593 | $ log '1 OR 2' | |
1594 | hg: parse error at 2: invalid token |
|
1594 | hg: parse error at 2: invalid token | |
1595 | [255] |
|
1595 | [255] | |
1596 |
|
1596 | |||
1597 | or operator should preserve ordering: |
|
1597 | or operator should preserve ordering: | |
1598 | $ log 'reverse(2::4) or tip' |
|
1598 | $ log 'reverse(2::4) or tip' | |
1599 | 4 |
|
1599 | 4 | |
1600 | 2 |
|
1600 | 2 | |
1601 | 9 |
|
1601 | 9 | |
1602 |
|
1602 | |||
1603 | parentrevspec |
|
1603 | parentrevspec | |
1604 |
|
1604 | |||
1605 | $ log 'merge()^0' |
|
1605 | $ log 'merge()^0' | |
1606 | 6 |
|
1606 | 6 | |
1607 | $ log 'merge()^' |
|
1607 | $ log 'merge()^' | |
1608 | 5 |
|
1608 | 5 | |
1609 | $ log 'merge()^1' |
|
1609 | $ log 'merge()^1' | |
1610 | 5 |
|
1610 | 5 | |
1611 | $ log 'merge()^2' |
|
1611 | $ log 'merge()^2' | |
1612 | 4 |
|
1612 | 4 | |
1613 | $ log 'merge()^^' |
|
1613 | $ log 'merge()^^' | |
1614 | 3 |
|
1614 | 3 | |
1615 | $ log 'merge()^1^' |
|
1615 | $ log 'merge()^1^' | |
1616 | 3 |
|
1616 | 3 | |
1617 | $ log 'merge()^^^' |
|
1617 | $ log 'merge()^^^' | |
1618 | 1 |
|
1618 | 1 | |
1619 |
|
1619 | |||
1620 | $ log 'merge()~0' |
|
1620 | $ log 'merge()~0' | |
1621 | 6 |
|
1621 | 6 | |
1622 | $ log 'merge()~1' |
|
1622 | $ log 'merge()~1' | |
1623 | 5 |
|
1623 | 5 | |
1624 | $ log 'merge()~2' |
|
1624 | $ log 'merge()~2' | |
1625 | 3 |
|
1625 | 3 | |
1626 | $ log 'merge()~2^1' |
|
1626 | $ log 'merge()~2^1' | |
1627 | 1 |
|
1627 | 1 | |
1628 | $ log 'merge()~3' |
|
1628 | $ log 'merge()~3' | |
1629 | 1 |
|
1629 | 1 | |
1630 |
|
1630 | |||
1631 | $ log '(-3:tip)^' |
|
1631 | $ log '(-3:tip)^' | |
1632 | 4 |
|
1632 | 4 | |
1633 | 6 |
|
1633 | 6 | |
1634 | 8 |
|
1634 | 8 | |
1635 |
|
1635 | |||
1636 | $ log 'tip^foo' |
|
1636 | $ log 'tip^foo' | |
1637 | hg: parse error: ^ expects a number 0, 1, or 2 |
|
1637 | hg: parse error: ^ expects a number 0, 1, or 2 | |
1638 | [255] |
|
1638 | [255] | |
1639 |
|
1639 | |||
1640 | Bogus function gets suggestions |
|
1640 | Bogus function gets suggestions | |
1641 | $ log 'add()' |
|
1641 | $ log 'add()' | |
1642 | hg: parse error: unknown identifier: add |
|
1642 | hg: parse error: unknown identifier: add | |
1643 | (did you mean adds?) |
|
1643 | (did you mean adds?) | |
1644 | [255] |
|
1644 | [255] | |
1645 | $ log 'added()' |
|
1645 | $ log 'added()' | |
1646 | hg: parse error: unknown identifier: added |
|
1646 | hg: parse error: unknown identifier: added | |
1647 | (did you mean adds?) |
|
1647 | (did you mean adds?) | |
1648 | [255] |
|
1648 | [255] | |
1649 | $ log 'remo()' |
|
1649 | $ log 'remo()' | |
1650 | hg: parse error: unknown identifier: remo |
|
1650 | hg: parse error: unknown identifier: remo | |
1651 | (did you mean one of remote, removes?) |
|
1651 | (did you mean one of remote, removes?) | |
1652 | [255] |
|
1652 | [255] | |
1653 | $ log 'babar()' |
|
1653 | $ log 'babar()' | |
1654 | hg: parse error: unknown identifier: babar |
|
1654 | hg: parse error: unknown identifier: babar | |
1655 | [255] |
|
1655 | [255] | |
1656 |
|
1656 | |||
1657 | Bogus function with a similar internal name doesn't suggest the internal name |
|
1657 | Bogus function with a similar internal name doesn't suggest the internal name | |
1658 | $ log 'matches()' |
|
1658 | $ log 'matches()' | |
1659 | hg: parse error: unknown identifier: matches |
|
1659 | hg: parse error: unknown identifier: matches | |
1660 | (did you mean matching?) |
|
1660 | (did you mean matching?) | |
1661 | [255] |
|
1661 | [255] | |
1662 |
|
1662 | |||
1663 | Undocumented functions aren't suggested as similar either |
|
1663 | Undocumented functions aren't suggested as similar either | |
1664 | $ log 'wdir2()' |
|
1664 | $ log 'wdir2()' | |
1665 | hg: parse error: unknown identifier: wdir2 |
|
1665 | hg: parse error: unknown identifier: wdir2 | |
1666 | [255] |
|
1666 | [255] | |
1667 |
|
1667 | |||
1668 | multiple revspecs |
|
1668 | multiple revspecs | |
1669 |
|
1669 | |||
1670 | $ hg log -r 'tip~1:tip' -r 'tip~2:tip~1' --template '{rev}\n' |
|
1670 | $ hg log -r 'tip~1:tip' -r 'tip~2:tip~1' --template '{rev}\n' | |
1671 | 8 |
|
1671 | 8 | |
1672 | 9 |
|
1672 | 9 | |
1673 | 4 |
|
1673 | 4 | |
1674 | 5 |
|
1674 | 5 | |
1675 | 6 |
|
1675 | 6 | |
1676 | 7 |
|
1676 | 7 | |
1677 |
|
1677 | |||
1678 | test usage in revpair (with "+") |
|
1678 | test usage in revpair (with "+") | |
1679 |
|
1679 | |||
1680 | (real pair) |
|
1680 | (real pair) | |
1681 |
|
1681 | |||
1682 | $ hg diff -r 'tip^^' -r 'tip' |
|
1682 | $ hg diff -r 'tip^^' -r 'tip' | |
1683 | diff -r 2326846efdab -r 24286f4ae135 .hgtags |
|
1683 | diff -r 2326846efdab -r 24286f4ae135 .hgtags | |
1684 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1684 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1685 | +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000 |
|
1685 | +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000 | |
1686 | @@ -0,0 +1,1 @@ |
|
1686 | @@ -0,0 +1,1 @@ | |
1687 | +e0cc66ef77e8b6f711815af4e001a6594fde3ba5 1.0 |
|
1687 | +e0cc66ef77e8b6f711815af4e001a6594fde3ba5 1.0 | |
1688 | $ hg diff -r 'tip^^::tip' |
|
1688 | $ hg diff -r 'tip^^::tip' | |
1689 | diff -r 2326846efdab -r 24286f4ae135 .hgtags |
|
1689 | diff -r 2326846efdab -r 24286f4ae135 .hgtags | |
1690 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1690 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1691 | +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000 |
|
1691 | +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000 | |
1692 | @@ -0,0 +1,1 @@ |
|
1692 | @@ -0,0 +1,1 @@ | |
1693 | +e0cc66ef77e8b6f711815af4e001a6594fde3ba5 1.0 |
|
1693 | +e0cc66ef77e8b6f711815af4e001a6594fde3ba5 1.0 | |
1694 |
|
1694 | |||
1695 | (single rev) |
|
1695 | (single rev) | |
1696 |
|
1696 | |||
1697 | $ hg diff -r 'tip^' -r 'tip^' |
|
1697 | $ hg diff -r 'tip^' -r 'tip^' | |
1698 | $ hg diff -r 'tip^:tip^' |
|
1698 | $ hg diff -r 'tip^:tip^' | |
1699 |
|
1699 | |||
1700 | (single rev that does not looks like a range) |
|
1700 | (single rev that does not looks like a range) | |
1701 |
|
1701 | |||
1702 | $ hg diff -r 'tip^::tip^ or tip^' |
|
1702 | $ hg diff -r 'tip^::tip^ or tip^' | |
1703 | diff -r d5d0dcbdc4d9 .hgtags |
|
1703 | diff -r d5d0dcbdc4d9 .hgtags | |
1704 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1704 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1705 | +++ b/.hgtags * (glob) |
|
1705 | +++ b/.hgtags * (glob) | |
1706 | @@ -0,0 +1,1 @@ |
|
1706 | @@ -0,0 +1,1 @@ | |
1707 | +e0cc66ef77e8b6f711815af4e001a6594fde3ba5 1.0 |
|
1707 | +e0cc66ef77e8b6f711815af4e001a6594fde3ba5 1.0 | |
1708 | $ hg diff -r 'tip^ or tip^' |
|
1708 | $ hg diff -r 'tip^ or tip^' | |
1709 | diff -r d5d0dcbdc4d9 .hgtags |
|
1709 | diff -r d5d0dcbdc4d9 .hgtags | |
1710 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1710 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1711 | +++ b/.hgtags * (glob) |
|
1711 | +++ b/.hgtags * (glob) | |
1712 | @@ -0,0 +1,1 @@ |
|
1712 | @@ -0,0 +1,1 @@ | |
1713 | +e0cc66ef77e8b6f711815af4e001a6594fde3ba5 1.0 |
|
1713 | +e0cc66ef77e8b6f711815af4e001a6594fde3ba5 1.0 | |
1714 |
|
1714 | |||
1715 | (no rev) |
|
1715 | (no rev) | |
1716 |
|
1716 | |||
1717 | $ hg diff -r 'author("babar") or author("celeste")' |
|
1717 | $ hg diff -r 'author("babar") or author("celeste")' | |
1718 | abort: empty revision range |
|
1718 | abort: empty revision range | |
1719 | [255] |
|
1719 | [255] | |
1720 |
|
1720 | |||
1721 | aliases: |
|
1721 | aliases: | |
1722 |
|
1722 | |||
1723 | $ echo '[revsetalias]' >> .hg/hgrc |
|
1723 | $ echo '[revsetalias]' >> .hg/hgrc | |
1724 | $ echo 'm = merge()' >> .hg/hgrc |
|
1724 | $ echo 'm = merge()' >> .hg/hgrc | |
1725 | (revset aliases can override builtin revsets) |
|
1725 | (revset aliases can override builtin revsets) | |
1726 | $ echo 'p2($1) = p1($1)' >> .hg/hgrc |
|
1726 | $ echo 'p2($1) = p1($1)' >> .hg/hgrc | |
1727 | $ echo 'sincem = descendants(m)' >> .hg/hgrc |
|
1727 | $ echo 'sincem = descendants(m)' >> .hg/hgrc | |
1728 | $ echo 'd($1) = reverse(sort($1, date))' >> .hg/hgrc |
|
1728 | $ echo 'd($1) = reverse(sort($1, date))' >> .hg/hgrc | |
1729 | $ echo 'rs(ARG1, ARG2) = reverse(sort(ARG1, ARG2))' >> .hg/hgrc |
|
1729 | $ echo 'rs(ARG1, ARG2) = reverse(sort(ARG1, ARG2))' >> .hg/hgrc | |
1730 | $ echo 'rs4(ARG1, ARGA, ARGB, ARG2) = reverse(sort(ARG1, ARG2))' >> .hg/hgrc |
|
1730 | $ echo 'rs4(ARG1, ARGA, ARGB, ARG2) = reverse(sort(ARG1, ARG2))' >> .hg/hgrc | |
1731 |
|
1731 | |||
1732 | $ try m |
|
1732 | $ try m | |
1733 | ('symbol', 'm') |
|
1733 | ('symbol', 'm') | |
1734 | * expanded: |
|
1734 | * expanded: | |
1735 | (func |
|
1735 | (func | |
1736 | ('symbol', 'merge') |
|
1736 | ('symbol', 'merge') | |
1737 | None) |
|
1737 | None) | |
1738 | * set: |
|
1738 | * set: | |
1739 | <filteredset |
|
1739 | <filteredset | |
1740 | <fullreposet+ 0:9>, |
|
1740 | <fullreposet+ 0:9>, | |
1741 | <merge>> |
|
1741 | <merge>> | |
1742 | 6 |
|
1742 | 6 | |
1743 |
|
1743 | |||
1744 | $ HGPLAIN=1 |
|
1744 | $ HGPLAIN=1 | |
1745 | $ export HGPLAIN |
|
1745 | $ export HGPLAIN | |
1746 | $ try m |
|
1746 | $ try m | |
1747 | ('symbol', 'm') |
|
1747 | ('symbol', 'm') | |
1748 | abort: unknown revision 'm'! |
|
1748 | abort: unknown revision 'm'! | |
1749 | [255] |
|
1749 | [255] | |
1750 |
|
1750 | |||
1751 | $ HGPLAINEXCEPT=revsetalias |
|
1751 | $ HGPLAINEXCEPT=revsetalias | |
1752 | $ export HGPLAINEXCEPT |
|
1752 | $ export HGPLAINEXCEPT | |
1753 | $ try m |
|
1753 | $ try m | |
1754 | ('symbol', 'm') |
|
1754 | ('symbol', 'm') | |
1755 | * expanded: |
|
1755 | * expanded: | |
1756 | (func |
|
1756 | (func | |
1757 | ('symbol', 'merge') |
|
1757 | ('symbol', 'merge') | |
1758 | None) |
|
1758 | None) | |
1759 | * set: |
|
1759 | * set: | |
1760 | <filteredset |
|
1760 | <filteredset | |
1761 | <fullreposet+ 0:9>, |
|
1761 | <fullreposet+ 0:9>, | |
1762 | <merge>> |
|
1762 | <merge>> | |
1763 | 6 |
|
1763 | 6 | |
1764 |
|
1764 | |||
1765 | $ unset HGPLAIN |
|
1765 | $ unset HGPLAIN | |
1766 | $ unset HGPLAINEXCEPT |
|
1766 | $ unset HGPLAINEXCEPT | |
1767 |
|
1767 | |||
1768 | $ try 'p2(.)' |
|
1768 | $ try 'p2(.)' | |
1769 | (func |
|
1769 | (func | |
1770 | ('symbol', 'p2') |
|
1770 | ('symbol', 'p2') | |
1771 | ('symbol', '.')) |
|
1771 | ('symbol', '.')) | |
1772 | * expanded: |
|
1772 | * expanded: | |
1773 | (func |
|
1773 | (func | |
1774 | ('symbol', 'p1') |
|
1774 | ('symbol', 'p1') | |
1775 | ('symbol', '.')) |
|
1775 | ('symbol', '.')) | |
1776 | * set: |
|
1776 | * set: | |
1777 | <baseset+ [8]> |
|
1777 | <baseset+ [8]> | |
1778 | 8 |
|
1778 | 8 | |
1779 |
|
1779 | |||
1780 | $ HGPLAIN=1 |
|
1780 | $ HGPLAIN=1 | |
1781 | $ export HGPLAIN |
|
1781 | $ export HGPLAIN | |
1782 | $ try 'p2(.)' |
|
1782 | $ try 'p2(.)' | |
1783 | (func |
|
1783 | (func | |
1784 | ('symbol', 'p2') |
|
1784 | ('symbol', 'p2') | |
1785 | ('symbol', '.')) |
|
1785 | ('symbol', '.')) | |
1786 | * set: |
|
1786 | * set: | |
1787 | <baseset+ []> |
|
1787 | <baseset+ []> | |
1788 |
|
1788 | |||
1789 | $ HGPLAINEXCEPT=revsetalias |
|
1789 | $ HGPLAINEXCEPT=revsetalias | |
1790 | $ export HGPLAINEXCEPT |
|
1790 | $ export HGPLAINEXCEPT | |
1791 | $ try 'p2(.)' |
|
1791 | $ try 'p2(.)' | |
1792 | (func |
|
1792 | (func | |
1793 | ('symbol', 'p2') |
|
1793 | ('symbol', 'p2') | |
1794 | ('symbol', '.')) |
|
1794 | ('symbol', '.')) | |
1795 | * expanded: |
|
1795 | * expanded: | |
1796 | (func |
|
1796 | (func | |
1797 | ('symbol', 'p1') |
|
1797 | ('symbol', 'p1') | |
1798 | ('symbol', '.')) |
|
1798 | ('symbol', '.')) | |
1799 | * set: |
|
1799 | * set: | |
1800 | <baseset+ [8]> |
|
1800 | <baseset+ [8]> | |
1801 | 8 |
|
1801 | 8 | |
1802 |
|
1802 | |||
1803 | $ unset HGPLAIN |
|
1803 | $ unset HGPLAIN | |
1804 | $ unset HGPLAINEXCEPT |
|
1804 | $ unset HGPLAINEXCEPT | |
1805 |
|
1805 | |||
1806 | test alias recursion |
|
1806 | test alias recursion | |
1807 |
|
1807 | |||
1808 | $ try sincem |
|
1808 | $ try sincem | |
1809 | ('symbol', 'sincem') |
|
1809 | ('symbol', 'sincem') | |
1810 | * expanded: |
|
1810 | * expanded: | |
1811 | (func |
|
1811 | (func | |
1812 | ('symbol', 'descendants') |
|
1812 | ('symbol', 'descendants') | |
1813 | (func |
|
1813 | (func | |
1814 | ('symbol', 'merge') |
|
1814 | ('symbol', 'merge') | |
1815 | None)) |
|
1815 | None)) | |
1816 | * set: |
|
1816 | * set: | |
1817 | <addset+ |
|
1817 | <addset+ | |
1818 | <filteredset |
|
1818 | <filteredset | |
1819 | <fullreposet+ 0:9>, |
|
1819 | <fullreposet+ 0:9>, | |
1820 | <merge>>, |
|
1820 | <merge>>, | |
1821 | <generatorset+>> |
|
1821 | <generatorset+>> | |
1822 | 6 |
|
1822 | 6 | |
1823 | 7 |
|
1823 | 7 | |
1824 |
|
1824 | |||
1825 | test infinite recursion |
|
1825 | test infinite recursion | |
1826 |
|
1826 | |||
1827 | $ echo 'recurse1 = recurse2' >> .hg/hgrc |
|
1827 | $ echo 'recurse1 = recurse2' >> .hg/hgrc | |
1828 | $ echo 'recurse2 = recurse1' >> .hg/hgrc |
|
1828 | $ echo 'recurse2 = recurse1' >> .hg/hgrc | |
1829 | $ try recurse1 |
|
1829 | $ try recurse1 | |
1830 | ('symbol', 'recurse1') |
|
1830 | ('symbol', 'recurse1') | |
1831 | hg: parse error: infinite expansion of revset alias "recurse1" detected |
|
1831 | hg: parse error: infinite expansion of revset alias "recurse1" detected | |
1832 | [255] |
|
1832 | [255] | |
1833 |
|
1833 | |||
1834 | $ echo 'level1($1, $2) = $1 or $2' >> .hg/hgrc |
|
1834 | $ echo 'level1($1, $2) = $1 or $2' >> .hg/hgrc | |
1835 | $ echo 'level2($1, $2) = level1($2, $1)' >> .hg/hgrc |
|
1835 | $ echo 'level2($1, $2) = level1($2, $1)' >> .hg/hgrc | |
1836 | $ try "level2(level1(1, 2), 3)" |
|
1836 | $ try "level2(level1(1, 2), 3)" | |
1837 | (func |
|
1837 | (func | |
1838 | ('symbol', 'level2') |
|
1838 | ('symbol', 'level2') | |
1839 | (list |
|
1839 | (list | |
1840 | (func |
|
1840 | (func | |
1841 | ('symbol', 'level1') |
|
1841 | ('symbol', 'level1') | |
1842 | (list |
|
1842 | (list | |
1843 | ('symbol', '1') |
|
1843 | ('symbol', '1') | |
1844 | ('symbol', '2'))) |
|
1844 | ('symbol', '2'))) | |
1845 | ('symbol', '3'))) |
|
1845 | ('symbol', '3'))) | |
1846 | * expanded: |
|
1846 | * expanded: | |
1847 | (or |
|
1847 | (or | |
1848 | ('symbol', '3') |
|
1848 | ('symbol', '3') | |
1849 | (or |
|
1849 | (or | |
1850 | ('symbol', '1') |
|
1850 | ('symbol', '1') | |
1851 | ('symbol', '2'))) |
|
1851 | ('symbol', '2'))) | |
1852 | * set: |
|
1852 | * set: | |
1853 | <addset |
|
1853 | <addset | |
1854 | <baseset [3]>, |
|
1854 | <baseset [3]>, | |
1855 | <baseset [1, 2]>> |
|
1855 | <baseset [1, 2]>> | |
1856 | 3 |
|
1856 | 3 | |
1857 | 1 |
|
1857 | 1 | |
1858 | 2 |
|
1858 | 2 | |
1859 |
|
1859 | |||
1860 | test nesting and variable passing |
|
1860 | test nesting and variable passing | |
1861 |
|
1861 | |||
1862 | $ echo 'nested($1) = nested2($1)' >> .hg/hgrc |
|
1862 | $ echo 'nested($1) = nested2($1)' >> .hg/hgrc | |
1863 | $ echo 'nested2($1) = nested3($1)' >> .hg/hgrc |
|
1863 | $ echo 'nested2($1) = nested3($1)' >> .hg/hgrc | |
1864 | $ echo 'nested3($1) = max($1)' >> .hg/hgrc |
|
1864 | $ echo 'nested3($1) = max($1)' >> .hg/hgrc | |
1865 | $ try 'nested(2:5)' |
|
1865 | $ try 'nested(2:5)' | |
1866 | (func |
|
1866 | (func | |
1867 | ('symbol', 'nested') |
|
1867 | ('symbol', 'nested') | |
1868 | (range |
|
1868 | (range | |
1869 | ('symbol', '2') |
|
1869 | ('symbol', '2') | |
1870 | ('symbol', '5'))) |
|
1870 | ('symbol', '5'))) | |
1871 | * expanded: |
|
1871 | * expanded: | |
1872 | (func |
|
1872 | (func | |
1873 | ('symbol', 'max') |
|
1873 | ('symbol', 'max') | |
1874 | (range |
|
1874 | (range | |
1875 | ('symbol', '2') |
|
1875 | ('symbol', '2') | |
1876 | ('symbol', '5'))) |
|
1876 | ('symbol', '5'))) | |
1877 | * set: |
|
1877 | * set: | |
1878 | <baseset |
|
1878 | <baseset | |
1879 | <max |
|
1879 | <max | |
1880 | <fullreposet+ 0:9>, |
|
1880 | <fullreposet+ 0:9>, | |
1881 | <spanset+ 2:5>>> |
|
1881 | <spanset+ 2:5>>> | |
1882 | 5 |
|
1882 | 5 | |
1883 |
|
1883 | |||
1884 | test chained `or` operations are flattened at parsing phase |
|
1884 | test chained `or` operations are flattened at parsing phase | |
1885 |
|
1885 | |||
1886 | $ echo 'chainedorops($1, $2, $3) = $1|$2|$3' >> .hg/hgrc |
|
1886 | $ echo 'chainedorops($1, $2, $3) = $1|$2|$3' >> .hg/hgrc | |
1887 | $ try 'chainedorops(0:1, 1:2, 2:3)' |
|
1887 | $ try 'chainedorops(0:1, 1:2, 2:3)' | |
1888 | (func |
|
1888 | (func | |
1889 | ('symbol', 'chainedorops') |
|
1889 | ('symbol', 'chainedorops') | |
1890 | (list |
|
1890 | (list | |
1891 | (range |
|
1891 | (range | |
1892 | ('symbol', '0') |
|
1892 | ('symbol', '0') | |
1893 | ('symbol', '1')) |
|
1893 | ('symbol', '1')) | |
1894 | (range |
|
1894 | (range | |
1895 | ('symbol', '1') |
|
1895 | ('symbol', '1') | |
1896 | ('symbol', '2')) |
|
1896 | ('symbol', '2')) | |
1897 | (range |
|
1897 | (range | |
1898 | ('symbol', '2') |
|
1898 | ('symbol', '2') | |
1899 | ('symbol', '3')))) |
|
1899 | ('symbol', '3')))) | |
1900 | * expanded: |
|
1900 | * expanded: | |
1901 | (or |
|
1901 | (or | |
1902 | (range |
|
1902 | (range | |
1903 | ('symbol', '0') |
|
1903 | ('symbol', '0') | |
1904 | ('symbol', '1')) |
|
1904 | ('symbol', '1')) | |
1905 | (range |
|
1905 | (range | |
1906 | ('symbol', '1') |
|
1906 | ('symbol', '1') | |
1907 | ('symbol', '2')) |
|
1907 | ('symbol', '2')) | |
1908 | (range |
|
1908 | (range | |
1909 | ('symbol', '2') |
|
1909 | ('symbol', '2') | |
1910 | ('symbol', '3'))) |
|
1910 | ('symbol', '3'))) | |
1911 | * set: |
|
1911 | * set: | |
1912 | <addset |
|
1912 | <addset | |
1913 | <spanset+ 0:1>, |
|
1913 | <spanset+ 0:1>, | |
1914 | <addset |
|
1914 | <addset | |
1915 | <spanset+ 1:2>, |
|
1915 | <spanset+ 1:2>, | |
1916 | <spanset+ 2:3>>> |
|
1916 | <spanset+ 2:3>>> | |
1917 | 0 |
|
1917 | 0 | |
1918 | 1 |
|
1918 | 1 | |
1919 | 2 |
|
1919 | 2 | |
1920 | 3 |
|
1920 | 3 | |
1921 |
|
1921 | |||
1922 | test variable isolation, variable placeholders are rewritten as string |
|
1922 | test variable isolation, variable placeholders are rewritten as string | |
1923 | then parsed and matched again as string. Check they do not leak too |
|
1923 | then parsed and matched again as string. Check they do not leak too | |
1924 | far away. |
|
1924 | far away. | |
1925 |
|
1925 | |||
1926 | $ echo 'injectparamasstring = max("$1")' >> .hg/hgrc |
|
1926 | $ echo 'injectparamasstring = max("$1")' >> .hg/hgrc | |
1927 | $ echo 'callinjection($1) = descendants(injectparamasstring)' >> .hg/hgrc |
|
1927 | $ echo 'callinjection($1) = descendants(injectparamasstring)' >> .hg/hgrc | |
1928 | $ try 'callinjection(2:5)' |
|
1928 | $ try 'callinjection(2:5)' | |
1929 | (func |
|
1929 | (func | |
1930 | ('symbol', 'callinjection') |
|
1930 | ('symbol', 'callinjection') | |
1931 | (range |
|
1931 | (range | |
1932 | ('symbol', '2') |
|
1932 | ('symbol', '2') | |
1933 | ('symbol', '5'))) |
|
1933 | ('symbol', '5'))) | |
1934 | * expanded: |
|
1934 | * expanded: | |
1935 | (func |
|
1935 | (func | |
1936 | ('symbol', 'descendants') |
|
1936 | ('symbol', 'descendants') | |
1937 | (func |
|
1937 | (func | |
1938 | ('symbol', 'max') |
|
1938 | ('symbol', 'max') | |
1939 | ('string', '$1'))) |
|
1939 | ('string', '$1'))) | |
1940 | abort: unknown revision '$1'! |
|
1940 | abort: unknown revision '$1'! | |
1941 | [255] |
|
1941 | [255] | |
1942 |
|
1942 | |||
1943 | test scope of alias expansion: 'universe' is expanded prior to 'shadowall(0)', |
|
1943 | test scope of alias expansion: 'universe' is expanded prior to 'shadowall(0)', | |
1944 | but 'all()' should never be substituded to '0()'. |
|
1944 | but 'all()' should never be substituded to '0()'. | |
1945 |
|
1945 | |||
1946 | $ echo 'universe = all()' >> .hg/hgrc |
|
1946 | $ echo 'universe = all()' >> .hg/hgrc | |
1947 | $ echo 'shadowall(all) = all and universe' >> .hg/hgrc |
|
1947 | $ echo 'shadowall(all) = all and universe' >> .hg/hgrc | |
1948 | $ try 'shadowall(0)' |
|
1948 | $ try 'shadowall(0)' | |
1949 | (func |
|
1949 | (func | |
1950 | ('symbol', 'shadowall') |
|
1950 | ('symbol', 'shadowall') | |
1951 | ('symbol', '0')) |
|
1951 | ('symbol', '0')) | |
1952 | * expanded: |
|
1952 | * expanded: | |
1953 | (and |
|
1953 | (and | |
1954 | ('symbol', '0') |
|
1954 | ('symbol', '0') | |
1955 | (func |
|
1955 | (func | |
1956 | ('symbol', 'all') |
|
1956 | ('symbol', 'all') | |
1957 | None)) |
|
1957 | None)) | |
1958 | * set: |
|
1958 | * set: | |
1959 | <filteredset |
|
1959 | <filteredset | |
1960 | <baseset [0]>, |
|
1960 | <baseset [0]>, | |
1961 | <spanset+ 0:9>> |
|
1961 | <spanset+ 0:9>> | |
1962 | 0 |
|
1962 | 0 | |
1963 |
|
1963 | |||
1964 | test unknown reference: |
|
1964 | test unknown reference: | |
1965 |
|
1965 | |||
1966 | $ try "unknownref(0)" --config 'revsetalias.unknownref($1)=$1:$2' |
|
1966 | $ try "unknownref(0)" --config 'revsetalias.unknownref($1)=$1:$2' | |
1967 | (func |
|
1967 | (func | |
1968 | ('symbol', 'unknownref') |
|
1968 | ('symbol', 'unknownref') | |
1969 | ('symbol', '0')) |
|
1969 | ('symbol', '0')) | |
1970 |
abort: failed to parse the definition of revset alias "unknownref": |
|
1970 | abort: failed to parse the definition of revset alias "unknownref": invalid symbol '$2' | |
1971 | [255] |
|
1971 | [255] | |
1972 |
|
1972 | |||
1973 | $ hg debugrevspec --debug --config revsetalias.anotherbadone='branch(' "tip" |
|
1973 | $ hg debugrevspec --debug --config revsetalias.anotherbadone='branch(' "tip" | |
1974 | ('symbol', 'tip') |
|
1974 | ('symbol', 'tip') | |
1975 | warning: failed to parse the definition of revset alias "anotherbadone": at 7: not a prefix: end |
|
1975 | warning: failed to parse the definition of revset alias "anotherbadone": at 7: not a prefix: end | |
1976 | * set: |
|
1976 | * set: | |
1977 | <baseset [9]> |
|
1977 | <baseset [9]> | |
1978 | 9 |
|
1978 | 9 | |
1979 |
|
1979 | |||
1980 | $ try 'tip' |
|
1980 | $ try 'tip' | |
1981 | ('symbol', 'tip') |
|
1981 | ('symbol', 'tip') | |
1982 | * set: |
|
1982 | * set: | |
1983 | <baseset [9]> |
|
1983 | <baseset [9]> | |
1984 | 9 |
|
1984 | 9 | |
1985 |
|
1985 | |||
1986 | $ hg debugrevspec --debug --config revsetalias.'bad name'='tip' "tip" |
|
1986 | $ hg debugrevspec --debug --config revsetalias.'bad name'='tip' "tip" | |
1987 | ('symbol', 'tip') |
|
1987 | ('symbol', 'tip') | |
1988 | warning: failed to parse the declaration of revset alias "bad name": at 4: invalid token |
|
1988 | warning: failed to parse the declaration of revset alias "bad name": at 4: invalid token | |
1989 | * set: |
|
1989 | * set: | |
1990 | <baseset [9]> |
|
1990 | <baseset [9]> | |
1991 | 9 |
|
1991 | 9 | |
1992 | $ echo 'strictreplacing($1, $10) = $10 or desc("$1")' >> .hg/hgrc |
|
1992 | $ echo 'strictreplacing($1, $10) = $10 or desc("$1")' >> .hg/hgrc | |
1993 | $ try 'strictreplacing("foo", tip)' |
|
1993 | $ try 'strictreplacing("foo", tip)' | |
1994 | (func |
|
1994 | (func | |
1995 | ('symbol', 'strictreplacing') |
|
1995 | ('symbol', 'strictreplacing') | |
1996 | (list |
|
1996 | (list | |
1997 | ('string', 'foo') |
|
1997 | ('string', 'foo') | |
1998 | ('symbol', 'tip'))) |
|
1998 | ('symbol', 'tip'))) | |
1999 | * expanded: |
|
1999 | * expanded: | |
2000 | (or |
|
2000 | (or | |
2001 | ('symbol', 'tip') |
|
2001 | ('symbol', 'tip') | |
2002 | (func |
|
2002 | (func | |
2003 | ('symbol', 'desc') |
|
2003 | ('symbol', 'desc') | |
2004 | ('string', '$1'))) |
|
2004 | ('string', '$1'))) | |
2005 | * set: |
|
2005 | * set: | |
2006 | <addset |
|
2006 | <addset | |
2007 | <baseset [9]>, |
|
2007 | <baseset [9]>, | |
2008 | <filteredset |
|
2008 | <filteredset | |
2009 | <fullreposet+ 0:9>, |
|
2009 | <fullreposet+ 0:9>, | |
2010 | <desc '$1'>>> |
|
2010 | <desc '$1'>>> | |
2011 | 9 |
|
2011 | 9 | |
2012 |
|
2012 | |||
2013 | $ try 'd(2:5)' |
|
2013 | $ try 'd(2:5)' | |
2014 | (func |
|
2014 | (func | |
2015 | ('symbol', 'd') |
|
2015 | ('symbol', 'd') | |
2016 | (range |
|
2016 | (range | |
2017 | ('symbol', '2') |
|
2017 | ('symbol', '2') | |
2018 | ('symbol', '5'))) |
|
2018 | ('symbol', '5'))) | |
2019 | * expanded: |
|
2019 | * expanded: | |
2020 | (func |
|
2020 | (func | |
2021 | ('symbol', 'reverse') |
|
2021 | ('symbol', 'reverse') | |
2022 | (func |
|
2022 | (func | |
2023 | ('symbol', 'sort') |
|
2023 | ('symbol', 'sort') | |
2024 | (list |
|
2024 | (list | |
2025 | (range |
|
2025 | (range | |
2026 | ('symbol', '2') |
|
2026 | ('symbol', '2') | |
2027 | ('symbol', '5')) |
|
2027 | ('symbol', '5')) | |
2028 | ('symbol', 'date')))) |
|
2028 | ('symbol', 'date')))) | |
2029 | * set: |
|
2029 | * set: | |
2030 | <baseset [4, 5, 3, 2]> |
|
2030 | <baseset [4, 5, 3, 2]> | |
2031 | 4 |
|
2031 | 4 | |
2032 | 5 |
|
2032 | 5 | |
2033 | 3 |
|
2033 | 3 | |
2034 | 2 |
|
2034 | 2 | |
2035 | $ try 'rs(2 or 3, date)' |
|
2035 | $ try 'rs(2 or 3, date)' | |
2036 | (func |
|
2036 | (func | |
2037 | ('symbol', 'rs') |
|
2037 | ('symbol', 'rs') | |
2038 | (list |
|
2038 | (list | |
2039 | (or |
|
2039 | (or | |
2040 | ('symbol', '2') |
|
2040 | ('symbol', '2') | |
2041 | ('symbol', '3')) |
|
2041 | ('symbol', '3')) | |
2042 | ('symbol', 'date'))) |
|
2042 | ('symbol', 'date'))) | |
2043 | * expanded: |
|
2043 | * expanded: | |
2044 | (func |
|
2044 | (func | |
2045 | ('symbol', 'reverse') |
|
2045 | ('symbol', 'reverse') | |
2046 | (func |
|
2046 | (func | |
2047 | ('symbol', 'sort') |
|
2047 | ('symbol', 'sort') | |
2048 | (list |
|
2048 | (list | |
2049 | (or |
|
2049 | (or | |
2050 | ('symbol', '2') |
|
2050 | ('symbol', '2') | |
2051 | ('symbol', '3')) |
|
2051 | ('symbol', '3')) | |
2052 | ('symbol', 'date')))) |
|
2052 | ('symbol', 'date')))) | |
2053 | * set: |
|
2053 | * set: | |
2054 | <baseset [3, 2]> |
|
2054 | <baseset [3, 2]> | |
2055 | 3 |
|
2055 | 3 | |
2056 | 2 |
|
2056 | 2 | |
2057 | $ try 'rs()' |
|
2057 | $ try 'rs()' | |
2058 | (func |
|
2058 | (func | |
2059 | ('symbol', 'rs') |
|
2059 | ('symbol', 'rs') | |
2060 | None) |
|
2060 | None) | |
2061 | hg: parse error: invalid number of arguments: 0 |
|
2061 | hg: parse error: invalid number of arguments: 0 | |
2062 | [255] |
|
2062 | [255] | |
2063 | $ try 'rs(2)' |
|
2063 | $ try 'rs(2)' | |
2064 | (func |
|
2064 | (func | |
2065 | ('symbol', 'rs') |
|
2065 | ('symbol', 'rs') | |
2066 | ('symbol', '2')) |
|
2066 | ('symbol', '2')) | |
2067 | hg: parse error: invalid number of arguments: 1 |
|
2067 | hg: parse error: invalid number of arguments: 1 | |
2068 | [255] |
|
2068 | [255] | |
2069 | $ try 'rs(2, data, 7)' |
|
2069 | $ try 'rs(2, data, 7)' | |
2070 | (func |
|
2070 | (func | |
2071 | ('symbol', 'rs') |
|
2071 | ('symbol', 'rs') | |
2072 | (list |
|
2072 | (list | |
2073 | ('symbol', '2') |
|
2073 | ('symbol', '2') | |
2074 | ('symbol', 'data') |
|
2074 | ('symbol', 'data') | |
2075 | ('symbol', '7'))) |
|
2075 | ('symbol', '7'))) | |
2076 | hg: parse error: invalid number of arguments: 3 |
|
2076 | hg: parse error: invalid number of arguments: 3 | |
2077 | [255] |
|
2077 | [255] | |
2078 | $ try 'rs4(2 or 3, x, x, date)' |
|
2078 | $ try 'rs4(2 or 3, x, x, date)' | |
2079 | (func |
|
2079 | (func | |
2080 | ('symbol', 'rs4') |
|
2080 | ('symbol', 'rs4') | |
2081 | (list |
|
2081 | (list | |
2082 | (or |
|
2082 | (or | |
2083 | ('symbol', '2') |
|
2083 | ('symbol', '2') | |
2084 | ('symbol', '3')) |
|
2084 | ('symbol', '3')) | |
2085 | ('symbol', 'x') |
|
2085 | ('symbol', 'x') | |
2086 | ('symbol', 'x') |
|
2086 | ('symbol', 'x') | |
2087 | ('symbol', 'date'))) |
|
2087 | ('symbol', 'date'))) | |
2088 | * expanded: |
|
2088 | * expanded: | |
2089 | (func |
|
2089 | (func | |
2090 | ('symbol', 'reverse') |
|
2090 | ('symbol', 'reverse') | |
2091 | (func |
|
2091 | (func | |
2092 | ('symbol', 'sort') |
|
2092 | ('symbol', 'sort') | |
2093 | (list |
|
2093 | (list | |
2094 | (or |
|
2094 | (or | |
2095 | ('symbol', '2') |
|
2095 | ('symbol', '2') | |
2096 | ('symbol', '3')) |
|
2096 | ('symbol', '3')) | |
2097 | ('symbol', 'date')))) |
|
2097 | ('symbol', 'date')))) | |
2098 | * set: |
|
2098 | * set: | |
2099 | <baseset [3, 2]> |
|
2099 | <baseset [3, 2]> | |
2100 | 3 |
|
2100 | 3 | |
2101 | 2 |
|
2101 | 2 | |
2102 |
|
2102 | |||
2103 | issue4553: check that revset aliases override existing hash prefix |
|
2103 | issue4553: check that revset aliases override existing hash prefix | |
2104 |
|
2104 | |||
2105 | $ hg log -qr e |
|
2105 | $ hg log -qr e | |
2106 | 6:e0cc66ef77e8 |
|
2106 | 6:e0cc66ef77e8 | |
2107 |
|
2107 | |||
2108 | $ hg log -qr e --config revsetalias.e="all()" |
|
2108 | $ hg log -qr e --config revsetalias.e="all()" | |
2109 | 0:2785f51eece5 |
|
2109 | 0:2785f51eece5 | |
2110 | 1:d75937da8da0 |
|
2110 | 1:d75937da8da0 | |
2111 | 2:5ed5505e9f1c |
|
2111 | 2:5ed5505e9f1c | |
2112 | 3:8528aa5637f2 |
|
2112 | 3:8528aa5637f2 | |
2113 | 4:2326846efdab |
|
2113 | 4:2326846efdab | |
2114 | 5:904fa392b941 |
|
2114 | 5:904fa392b941 | |
2115 | 6:e0cc66ef77e8 |
|
2115 | 6:e0cc66ef77e8 | |
2116 | 7:013af1973af4 |
|
2116 | 7:013af1973af4 | |
2117 | 8:d5d0dcbdc4d9 |
|
2117 | 8:d5d0dcbdc4d9 | |
2118 | 9:24286f4ae135 |
|
2118 | 9:24286f4ae135 | |
2119 |
|
2119 | |||
2120 | $ hg log -qr e: --config revsetalias.e="0" |
|
2120 | $ hg log -qr e: --config revsetalias.e="0" | |
2121 | 0:2785f51eece5 |
|
2121 | 0:2785f51eece5 | |
2122 | 1:d75937da8da0 |
|
2122 | 1:d75937da8da0 | |
2123 | 2:5ed5505e9f1c |
|
2123 | 2:5ed5505e9f1c | |
2124 | 3:8528aa5637f2 |
|
2124 | 3:8528aa5637f2 | |
2125 | 4:2326846efdab |
|
2125 | 4:2326846efdab | |
2126 | 5:904fa392b941 |
|
2126 | 5:904fa392b941 | |
2127 | 6:e0cc66ef77e8 |
|
2127 | 6:e0cc66ef77e8 | |
2128 | 7:013af1973af4 |
|
2128 | 7:013af1973af4 | |
2129 | 8:d5d0dcbdc4d9 |
|
2129 | 8:d5d0dcbdc4d9 | |
2130 | 9:24286f4ae135 |
|
2130 | 9:24286f4ae135 | |
2131 |
|
2131 | |||
2132 | $ hg log -qr :e --config revsetalias.e="9" |
|
2132 | $ hg log -qr :e --config revsetalias.e="9" | |
2133 | 0:2785f51eece5 |
|
2133 | 0:2785f51eece5 | |
2134 | 1:d75937da8da0 |
|
2134 | 1:d75937da8da0 | |
2135 | 2:5ed5505e9f1c |
|
2135 | 2:5ed5505e9f1c | |
2136 | 3:8528aa5637f2 |
|
2136 | 3:8528aa5637f2 | |
2137 | 4:2326846efdab |
|
2137 | 4:2326846efdab | |
2138 | 5:904fa392b941 |
|
2138 | 5:904fa392b941 | |
2139 | 6:e0cc66ef77e8 |
|
2139 | 6:e0cc66ef77e8 | |
2140 | 7:013af1973af4 |
|
2140 | 7:013af1973af4 | |
2141 | 8:d5d0dcbdc4d9 |
|
2141 | 8:d5d0dcbdc4d9 | |
2142 | 9:24286f4ae135 |
|
2142 | 9:24286f4ae135 | |
2143 |
|
2143 | |||
2144 | $ hg log -qr e: |
|
2144 | $ hg log -qr e: | |
2145 | 6:e0cc66ef77e8 |
|
2145 | 6:e0cc66ef77e8 | |
2146 | 7:013af1973af4 |
|
2146 | 7:013af1973af4 | |
2147 | 8:d5d0dcbdc4d9 |
|
2147 | 8:d5d0dcbdc4d9 | |
2148 | 9:24286f4ae135 |
|
2148 | 9:24286f4ae135 | |
2149 |
|
2149 | |||
2150 | $ hg log -qr :e |
|
2150 | $ hg log -qr :e | |
2151 | 0:2785f51eece5 |
|
2151 | 0:2785f51eece5 | |
2152 | 1:d75937da8da0 |
|
2152 | 1:d75937da8da0 | |
2153 | 2:5ed5505e9f1c |
|
2153 | 2:5ed5505e9f1c | |
2154 | 3:8528aa5637f2 |
|
2154 | 3:8528aa5637f2 | |
2155 | 4:2326846efdab |
|
2155 | 4:2326846efdab | |
2156 | 5:904fa392b941 |
|
2156 | 5:904fa392b941 | |
2157 | 6:e0cc66ef77e8 |
|
2157 | 6:e0cc66ef77e8 | |
2158 |
|
2158 | |||
2159 | issue2549 - correct optimizations |
|
2159 | issue2549 - correct optimizations | |
2160 |
|
2160 | |||
2161 | $ try 'limit(1 or 2 or 3, 2) and not 2' |
|
2161 | $ try 'limit(1 or 2 or 3, 2) and not 2' | |
2162 | (and |
|
2162 | (and | |
2163 | (func |
|
2163 | (func | |
2164 | ('symbol', 'limit') |
|
2164 | ('symbol', 'limit') | |
2165 | (list |
|
2165 | (list | |
2166 | (or |
|
2166 | (or | |
2167 | ('symbol', '1') |
|
2167 | ('symbol', '1') | |
2168 | ('symbol', '2') |
|
2168 | ('symbol', '2') | |
2169 | ('symbol', '3')) |
|
2169 | ('symbol', '3')) | |
2170 | ('symbol', '2'))) |
|
2170 | ('symbol', '2'))) | |
2171 | (not |
|
2171 | (not | |
2172 | ('symbol', '2'))) |
|
2172 | ('symbol', '2'))) | |
2173 | * set: |
|
2173 | * set: | |
2174 | <filteredset |
|
2174 | <filteredset | |
2175 | <baseset |
|
2175 | <baseset | |
2176 | <limit n=2, offset=0, |
|
2176 | <limit n=2, offset=0, | |
2177 | <fullreposet+ 0:9>, |
|
2177 | <fullreposet+ 0:9>, | |
2178 | <baseset [1, 2, 3]>>>, |
|
2178 | <baseset [1, 2, 3]>>>, | |
2179 | <not |
|
2179 | <not | |
2180 | <baseset [2]>>> |
|
2180 | <baseset [2]>>> | |
2181 | 1 |
|
2181 | 1 | |
2182 | $ try 'max(1 or 2) and not 2' |
|
2182 | $ try 'max(1 or 2) and not 2' | |
2183 | (and |
|
2183 | (and | |
2184 | (func |
|
2184 | (func | |
2185 | ('symbol', 'max') |
|
2185 | ('symbol', 'max') | |
2186 | (or |
|
2186 | (or | |
2187 | ('symbol', '1') |
|
2187 | ('symbol', '1') | |
2188 | ('symbol', '2'))) |
|
2188 | ('symbol', '2'))) | |
2189 | (not |
|
2189 | (not | |
2190 | ('symbol', '2'))) |
|
2190 | ('symbol', '2'))) | |
2191 | * set: |
|
2191 | * set: | |
2192 | <filteredset |
|
2192 | <filteredset | |
2193 | <baseset |
|
2193 | <baseset | |
2194 | <max |
|
2194 | <max | |
2195 | <fullreposet+ 0:9>, |
|
2195 | <fullreposet+ 0:9>, | |
2196 | <baseset [1, 2]>>>, |
|
2196 | <baseset [1, 2]>>>, | |
2197 | <not |
|
2197 | <not | |
2198 | <baseset [2]>>> |
|
2198 | <baseset [2]>>> | |
2199 | $ try 'min(1 or 2) and not 1' |
|
2199 | $ try 'min(1 or 2) and not 1' | |
2200 | (and |
|
2200 | (and | |
2201 | (func |
|
2201 | (func | |
2202 | ('symbol', 'min') |
|
2202 | ('symbol', 'min') | |
2203 | (or |
|
2203 | (or | |
2204 | ('symbol', '1') |
|
2204 | ('symbol', '1') | |
2205 | ('symbol', '2'))) |
|
2205 | ('symbol', '2'))) | |
2206 | (not |
|
2206 | (not | |
2207 | ('symbol', '1'))) |
|
2207 | ('symbol', '1'))) | |
2208 | * set: |
|
2208 | * set: | |
2209 | <filteredset |
|
2209 | <filteredset | |
2210 | <baseset |
|
2210 | <baseset | |
2211 | <min |
|
2211 | <min | |
2212 | <fullreposet+ 0:9>, |
|
2212 | <fullreposet+ 0:9>, | |
2213 | <baseset [1, 2]>>>, |
|
2213 | <baseset [1, 2]>>>, | |
2214 | <not |
|
2214 | <not | |
2215 | <baseset [1]>>> |
|
2215 | <baseset [1]>>> | |
2216 | $ try 'last(1 or 2, 1) and not 2' |
|
2216 | $ try 'last(1 or 2, 1) and not 2' | |
2217 | (and |
|
2217 | (and | |
2218 | (func |
|
2218 | (func | |
2219 | ('symbol', 'last') |
|
2219 | ('symbol', 'last') | |
2220 | (list |
|
2220 | (list | |
2221 | (or |
|
2221 | (or | |
2222 | ('symbol', '1') |
|
2222 | ('symbol', '1') | |
2223 | ('symbol', '2')) |
|
2223 | ('symbol', '2')) | |
2224 | ('symbol', '1'))) |
|
2224 | ('symbol', '1'))) | |
2225 | (not |
|
2225 | (not | |
2226 | ('symbol', '2'))) |
|
2226 | ('symbol', '2'))) | |
2227 | * set: |
|
2227 | * set: | |
2228 | <filteredset |
|
2228 | <filteredset | |
2229 | <baseset |
|
2229 | <baseset | |
2230 | <last n=1, |
|
2230 | <last n=1, | |
2231 | <fullreposet+ 0:9>, |
|
2231 | <fullreposet+ 0:9>, | |
2232 | <baseset [2, 1]>>>, |
|
2232 | <baseset [2, 1]>>>, | |
2233 | <not |
|
2233 | <not | |
2234 | <baseset [2]>>> |
|
2234 | <baseset [2]>>> | |
2235 |
|
2235 | |||
2236 | issue4289 - ordering of built-ins |
|
2236 | issue4289 - ordering of built-ins | |
2237 | $ hg log -M -q -r 3:2 |
|
2237 | $ hg log -M -q -r 3:2 | |
2238 | 3:8528aa5637f2 |
|
2238 | 3:8528aa5637f2 | |
2239 | 2:5ed5505e9f1c |
|
2239 | 2:5ed5505e9f1c | |
2240 |
|
2240 | |||
2241 | test revsets started with 40-chars hash (issue3669) |
|
2241 | test revsets started with 40-chars hash (issue3669) | |
2242 |
|
2242 | |||
2243 | $ ISSUE3669_TIP=`hg tip --template '{node}'` |
|
2243 | $ ISSUE3669_TIP=`hg tip --template '{node}'` | |
2244 | $ hg log -r "${ISSUE3669_TIP}" --template '{rev}\n' |
|
2244 | $ hg log -r "${ISSUE3669_TIP}" --template '{rev}\n' | |
2245 | 9 |
|
2245 | 9 | |
2246 | $ hg log -r "${ISSUE3669_TIP}^" --template '{rev}\n' |
|
2246 | $ hg log -r "${ISSUE3669_TIP}^" --template '{rev}\n' | |
2247 | 8 |
|
2247 | 8 | |
2248 |
|
2248 | |||
2249 | test or-ed indirect predicates (issue3775) |
|
2249 | test or-ed indirect predicates (issue3775) | |
2250 |
|
2250 | |||
2251 | $ log '6 or 6^1' | sort |
|
2251 | $ log '6 or 6^1' | sort | |
2252 | 5 |
|
2252 | 5 | |
2253 | 6 |
|
2253 | 6 | |
2254 | $ log '6^1 or 6' | sort |
|
2254 | $ log '6^1 or 6' | sort | |
2255 | 5 |
|
2255 | 5 | |
2256 | 6 |
|
2256 | 6 | |
2257 | $ log '4 or 4~1' | sort |
|
2257 | $ log '4 or 4~1' | sort | |
2258 | 2 |
|
2258 | 2 | |
2259 | 4 |
|
2259 | 4 | |
2260 | $ log '4~1 or 4' | sort |
|
2260 | $ log '4~1 or 4' | sort | |
2261 | 2 |
|
2261 | 2 | |
2262 | 4 |
|
2262 | 4 | |
2263 | $ log '(0 or 2):(4 or 6) or 0 or 6' | sort |
|
2263 | $ log '(0 or 2):(4 or 6) or 0 or 6' | sort | |
2264 | 0 |
|
2264 | 0 | |
2265 | 1 |
|
2265 | 1 | |
2266 | 2 |
|
2266 | 2 | |
2267 | 3 |
|
2267 | 3 | |
2268 | 4 |
|
2268 | 4 | |
2269 | 5 |
|
2269 | 5 | |
2270 | 6 |
|
2270 | 6 | |
2271 | $ log '0 or 6 or (0 or 2):(4 or 6)' | sort |
|
2271 | $ log '0 or 6 or (0 or 2):(4 or 6)' | sort | |
2272 | 0 |
|
2272 | 0 | |
2273 | 1 |
|
2273 | 1 | |
2274 | 2 |
|
2274 | 2 | |
2275 | 3 |
|
2275 | 3 | |
2276 | 4 |
|
2276 | 4 | |
2277 | 5 |
|
2277 | 5 | |
2278 | 6 |
|
2278 | 6 | |
2279 |
|
2279 | |||
2280 | tests for 'remote()' predicate: |
|
2280 | tests for 'remote()' predicate: | |
2281 | #. (csets in remote) (id) (remote) |
|
2281 | #. (csets in remote) (id) (remote) | |
2282 | 1. less than local current branch "default" |
|
2282 | 1. less than local current branch "default" | |
2283 | 2. same with local specified "default" |
|
2283 | 2. same with local specified "default" | |
2284 | 3. more than local specified specified |
|
2284 | 3. more than local specified specified | |
2285 |
|
2285 | |||
2286 | $ hg clone --quiet -U . ../remote3 |
|
2286 | $ hg clone --quiet -U . ../remote3 | |
2287 | $ cd ../remote3 |
|
2287 | $ cd ../remote3 | |
2288 | $ hg update -q 7 |
|
2288 | $ hg update -q 7 | |
2289 | $ echo r > r |
|
2289 | $ echo r > r | |
2290 | $ hg ci -Aqm 10 |
|
2290 | $ hg ci -Aqm 10 | |
2291 | $ log 'remote()' |
|
2291 | $ log 'remote()' | |
2292 | 7 |
|
2292 | 7 | |
2293 | $ log 'remote("a-b-c-")' |
|
2293 | $ log 'remote("a-b-c-")' | |
2294 | 2 |
|
2294 | 2 | |
2295 | $ cd ../repo |
|
2295 | $ cd ../repo | |
2296 | $ log 'remote(".a.b.c.", "../remote3")' |
|
2296 | $ log 'remote(".a.b.c.", "../remote3")' | |
2297 |
|
2297 | |||
2298 | tests for concatenation of strings/symbols by "##" |
|
2298 | tests for concatenation of strings/symbols by "##" | |
2299 |
|
2299 | |||
2300 | $ try "278 ## '5f5' ## 1ee ## 'ce5'" |
|
2300 | $ try "278 ## '5f5' ## 1ee ## 'ce5'" | |
2301 | (_concat |
|
2301 | (_concat | |
2302 | (_concat |
|
2302 | (_concat | |
2303 | (_concat |
|
2303 | (_concat | |
2304 | ('symbol', '278') |
|
2304 | ('symbol', '278') | |
2305 | ('string', '5f5')) |
|
2305 | ('string', '5f5')) | |
2306 | ('symbol', '1ee')) |
|
2306 | ('symbol', '1ee')) | |
2307 | ('string', 'ce5')) |
|
2307 | ('string', 'ce5')) | |
2308 | * concatenated: |
|
2308 | * concatenated: | |
2309 | ('string', '2785f51eece5') |
|
2309 | ('string', '2785f51eece5') | |
2310 | * set: |
|
2310 | * set: | |
2311 | <baseset [0]> |
|
2311 | <baseset [0]> | |
2312 | 0 |
|
2312 | 0 | |
2313 |
|
2313 | |||
2314 | $ echo 'cat4($1, $2, $3, $4) = $1 ## $2 ## $3 ## $4' >> .hg/hgrc |
|
2314 | $ echo 'cat4($1, $2, $3, $4) = $1 ## $2 ## $3 ## $4' >> .hg/hgrc | |
2315 | $ try "cat4(278, '5f5', 1ee, 'ce5')" |
|
2315 | $ try "cat4(278, '5f5', 1ee, 'ce5')" | |
2316 | (func |
|
2316 | (func | |
2317 | ('symbol', 'cat4') |
|
2317 | ('symbol', 'cat4') | |
2318 | (list |
|
2318 | (list | |
2319 | ('symbol', '278') |
|
2319 | ('symbol', '278') | |
2320 | ('string', '5f5') |
|
2320 | ('string', '5f5') | |
2321 | ('symbol', '1ee') |
|
2321 | ('symbol', '1ee') | |
2322 | ('string', 'ce5'))) |
|
2322 | ('string', 'ce5'))) | |
2323 | * expanded: |
|
2323 | * expanded: | |
2324 | (_concat |
|
2324 | (_concat | |
2325 | (_concat |
|
2325 | (_concat | |
2326 | (_concat |
|
2326 | (_concat | |
2327 | ('symbol', '278') |
|
2327 | ('symbol', '278') | |
2328 | ('string', '5f5')) |
|
2328 | ('string', '5f5')) | |
2329 | ('symbol', '1ee')) |
|
2329 | ('symbol', '1ee')) | |
2330 | ('string', 'ce5')) |
|
2330 | ('string', 'ce5')) | |
2331 | * concatenated: |
|
2331 | * concatenated: | |
2332 | ('string', '2785f51eece5') |
|
2332 | ('string', '2785f51eece5') | |
2333 | * set: |
|
2333 | * set: | |
2334 | <baseset [0]> |
|
2334 | <baseset [0]> | |
2335 | 0 |
|
2335 | 0 | |
2336 |
|
2336 | |||
2337 | (check concatenation in alias nesting) |
|
2337 | (check concatenation in alias nesting) | |
2338 |
|
2338 | |||
2339 | $ echo 'cat2($1, $2) = $1 ## $2' >> .hg/hgrc |
|
2339 | $ echo 'cat2($1, $2) = $1 ## $2' >> .hg/hgrc | |
2340 | $ echo 'cat2x2($1, $2, $3, $4) = cat2($1 ## $2, $3 ## $4)' >> .hg/hgrc |
|
2340 | $ echo 'cat2x2($1, $2, $3, $4) = cat2($1 ## $2, $3 ## $4)' >> .hg/hgrc | |
2341 | $ log "cat2x2(278, '5f5', 1ee, 'ce5')" |
|
2341 | $ log "cat2x2(278, '5f5', 1ee, 'ce5')" | |
2342 | 0 |
|
2342 | 0 | |
2343 |
|
2343 | |||
2344 | (check operator priority) |
|
2344 | (check operator priority) | |
2345 |
|
2345 | |||
2346 | $ echo 'cat2n2($1, $2, $3, $4) = $1 ## $2 or $3 ## $4~2' >> .hg/hgrc |
|
2346 | $ echo 'cat2n2($1, $2, $3, $4) = $1 ## $2 or $3 ## $4~2' >> .hg/hgrc | |
2347 | $ log "cat2n2(2785f5, 1eece5, 24286f, 4ae135)" |
|
2347 | $ log "cat2n2(2785f5, 1eece5, 24286f, 4ae135)" | |
2348 | 0 |
|
2348 | 0 | |
2349 | 4 |
|
2349 | 4 | |
2350 |
|
2350 | |||
2351 | $ cd .. |
|
2351 | $ cd .. | |
2352 |
|
2352 | |||
2353 | prepare repository that has "default" branches of multiple roots |
|
2353 | prepare repository that has "default" branches of multiple roots | |
2354 |
|
2354 | |||
2355 | $ hg init namedbranch |
|
2355 | $ hg init namedbranch | |
2356 | $ cd namedbranch |
|
2356 | $ cd namedbranch | |
2357 |
|
2357 | |||
2358 | $ echo default0 >> a |
|
2358 | $ echo default0 >> a | |
2359 | $ hg ci -Aqm0 |
|
2359 | $ hg ci -Aqm0 | |
2360 | $ echo default1 >> a |
|
2360 | $ echo default1 >> a | |
2361 | $ hg ci -m1 |
|
2361 | $ hg ci -m1 | |
2362 |
|
2362 | |||
2363 | $ hg branch -q stable |
|
2363 | $ hg branch -q stable | |
2364 | $ echo stable2 >> a |
|
2364 | $ echo stable2 >> a | |
2365 | $ hg ci -m2 |
|
2365 | $ hg ci -m2 | |
2366 | $ echo stable3 >> a |
|
2366 | $ echo stable3 >> a | |
2367 | $ hg ci -m3 |
|
2367 | $ hg ci -m3 | |
2368 |
|
2368 | |||
2369 | $ hg update -q null |
|
2369 | $ hg update -q null | |
2370 | $ echo default4 >> a |
|
2370 | $ echo default4 >> a | |
2371 | $ hg ci -Aqm4 |
|
2371 | $ hg ci -Aqm4 | |
2372 | $ echo default5 >> a |
|
2372 | $ echo default5 >> a | |
2373 | $ hg ci -m5 |
|
2373 | $ hg ci -m5 | |
2374 |
|
2374 | |||
2375 | "null" revision belongs to "default" branch (issue4683) |
|
2375 | "null" revision belongs to "default" branch (issue4683) | |
2376 |
|
2376 | |||
2377 | $ log 'branch(null)' |
|
2377 | $ log 'branch(null)' | |
2378 | 0 |
|
2378 | 0 | |
2379 | 1 |
|
2379 | 1 | |
2380 | 4 |
|
2380 | 4 | |
2381 | 5 |
|
2381 | 5 | |
2382 |
|
2382 | |||
2383 | "null" revision belongs to "default" branch, but it shouldn't appear in set |
|
2383 | "null" revision belongs to "default" branch, but it shouldn't appear in set | |
2384 | unless explicitly specified (issue4682) |
|
2384 | unless explicitly specified (issue4682) | |
2385 |
|
2385 | |||
2386 | $ log 'children(branch(default))' |
|
2386 | $ log 'children(branch(default))' | |
2387 | 1 |
|
2387 | 1 | |
2388 | 2 |
|
2388 | 2 | |
2389 | 5 |
|
2389 | 5 | |
2390 |
|
2390 | |||
2391 | $ cd .. |
|
2391 | $ cd .. | |
2392 |
|
2392 | |||
2393 | test author/desc/keyword in problematic encoding |
|
2393 | test author/desc/keyword in problematic encoding | |
2394 | # unicode: cp932: |
|
2394 | # unicode: cp932: | |
2395 | # u30A2 0x83 0x41(= 'A') |
|
2395 | # u30A2 0x83 0x41(= 'A') | |
2396 | # u30C2 0x83 0x61(= 'a') |
|
2396 | # u30C2 0x83 0x61(= 'a') | |
2397 |
|
2397 | |||
2398 | $ hg init problematicencoding |
|
2398 | $ hg init problematicencoding | |
2399 | $ cd problematicencoding |
|
2399 | $ cd problematicencoding | |
2400 |
|
2400 | |||
2401 | $ python > setup.sh <<EOF |
|
2401 | $ python > setup.sh <<EOF | |
2402 | > print u''' |
|
2402 | > print u''' | |
2403 | > echo a > text |
|
2403 | > echo a > text | |
2404 | > hg add text |
|
2404 | > hg add text | |
2405 | > hg --encoding utf-8 commit -u '\u30A2' -m none |
|
2405 | > hg --encoding utf-8 commit -u '\u30A2' -m none | |
2406 | > echo b > text |
|
2406 | > echo b > text | |
2407 | > hg --encoding utf-8 commit -u '\u30C2' -m none |
|
2407 | > hg --encoding utf-8 commit -u '\u30C2' -m none | |
2408 | > echo c > text |
|
2408 | > echo c > text | |
2409 | > hg --encoding utf-8 commit -u none -m '\u30A2' |
|
2409 | > hg --encoding utf-8 commit -u none -m '\u30A2' | |
2410 | > echo d > text |
|
2410 | > echo d > text | |
2411 | > hg --encoding utf-8 commit -u none -m '\u30C2' |
|
2411 | > hg --encoding utf-8 commit -u none -m '\u30C2' | |
2412 | > '''.encode('utf-8') |
|
2412 | > '''.encode('utf-8') | |
2413 | > EOF |
|
2413 | > EOF | |
2414 | $ sh < setup.sh |
|
2414 | $ sh < setup.sh | |
2415 |
|
2415 | |||
2416 | test in problematic encoding |
|
2416 | test in problematic encoding | |
2417 | $ python > test.sh <<EOF |
|
2417 | $ python > test.sh <<EOF | |
2418 | > print u''' |
|
2418 | > print u''' | |
2419 | > hg --encoding cp932 log --template '{rev}\\n' -r 'author(\u30A2)' |
|
2419 | > hg --encoding cp932 log --template '{rev}\\n' -r 'author(\u30A2)' | |
2420 | > echo ==== |
|
2420 | > echo ==== | |
2421 | > hg --encoding cp932 log --template '{rev}\\n' -r 'author(\u30C2)' |
|
2421 | > hg --encoding cp932 log --template '{rev}\\n' -r 'author(\u30C2)' | |
2422 | > echo ==== |
|
2422 | > echo ==== | |
2423 | > hg --encoding cp932 log --template '{rev}\\n' -r 'desc(\u30A2)' |
|
2423 | > hg --encoding cp932 log --template '{rev}\\n' -r 'desc(\u30A2)' | |
2424 | > echo ==== |
|
2424 | > echo ==== | |
2425 | > hg --encoding cp932 log --template '{rev}\\n' -r 'desc(\u30C2)' |
|
2425 | > hg --encoding cp932 log --template '{rev}\\n' -r 'desc(\u30C2)' | |
2426 | > echo ==== |
|
2426 | > echo ==== | |
2427 | > hg --encoding cp932 log --template '{rev}\\n' -r 'keyword(\u30A2)' |
|
2427 | > hg --encoding cp932 log --template '{rev}\\n' -r 'keyword(\u30A2)' | |
2428 | > echo ==== |
|
2428 | > echo ==== | |
2429 | > hg --encoding cp932 log --template '{rev}\\n' -r 'keyword(\u30C2)' |
|
2429 | > hg --encoding cp932 log --template '{rev}\\n' -r 'keyword(\u30C2)' | |
2430 | > '''.encode('cp932') |
|
2430 | > '''.encode('cp932') | |
2431 | > EOF |
|
2431 | > EOF | |
2432 | $ sh < test.sh |
|
2432 | $ sh < test.sh | |
2433 | 0 |
|
2433 | 0 | |
2434 | ==== |
|
2434 | ==== | |
2435 | 1 |
|
2435 | 1 | |
2436 | ==== |
|
2436 | ==== | |
2437 | 2 |
|
2437 | 2 | |
2438 | ==== |
|
2438 | ==== | |
2439 | 3 |
|
2439 | 3 | |
2440 | ==== |
|
2440 | ==== | |
2441 | 0 |
|
2441 | 0 | |
2442 | 2 |
|
2442 | 2 | |
2443 | ==== |
|
2443 | ==== | |
2444 | 1 |
|
2444 | 1 | |
2445 | 3 |
|
2445 | 3 | |
2446 |
|
2446 | |||
2447 | test error message of bad revset |
|
2447 | test error message of bad revset | |
2448 | $ hg log -r 'foo\\' |
|
2448 | $ hg log -r 'foo\\' | |
2449 | hg: parse error at 3: syntax error in revset 'foo\\' |
|
2449 | hg: parse error at 3: syntax error in revset 'foo\\' | |
2450 | [255] |
|
2450 | [255] | |
2451 |
|
2451 | |||
2452 | $ cd .. |
|
2452 | $ cd .. | |
2453 |
|
2453 | |||
2454 | Test that revset predicate of extension isn't loaded at failure of |
|
2454 | Test that revset predicate of extension isn't loaded at failure of | |
2455 | loading it |
|
2455 | loading it | |
2456 |
|
2456 | |||
2457 | $ cd repo |
|
2457 | $ cd repo | |
2458 |
|
2458 | |||
2459 | $ cat <<EOF > $TESTTMP/custompredicate.py |
|
2459 | $ cat <<EOF > $TESTTMP/custompredicate.py | |
2460 | > from mercurial import error, registrar, revset |
|
2460 | > from mercurial import error, registrar, revset | |
2461 | > |
|
2461 | > | |
2462 | > revsetpredicate = registrar.revsetpredicate() |
|
2462 | > revsetpredicate = registrar.revsetpredicate() | |
2463 | > |
|
2463 | > | |
2464 | > @revsetpredicate('custom1()') |
|
2464 | > @revsetpredicate('custom1()') | |
2465 | > def custom1(repo, subset, x): |
|
2465 | > def custom1(repo, subset, x): | |
2466 | > return revset.baseset([1]) |
|
2466 | > return revset.baseset([1]) | |
2467 | > |
|
2467 | > | |
2468 | > raise error.Abort('intentional failure of loading extension') |
|
2468 | > raise error.Abort('intentional failure of loading extension') | |
2469 | > EOF |
|
2469 | > EOF | |
2470 | $ cat <<EOF > .hg/hgrc |
|
2470 | $ cat <<EOF > .hg/hgrc | |
2471 | > [extensions] |
|
2471 | > [extensions] | |
2472 | > custompredicate = $TESTTMP/custompredicate.py |
|
2472 | > custompredicate = $TESTTMP/custompredicate.py | |
2473 | > EOF |
|
2473 | > EOF | |
2474 |
|
2474 | |||
2475 | $ hg debugrevspec "custom1()" |
|
2475 | $ hg debugrevspec "custom1()" | |
2476 | *** failed to import extension custompredicate from $TESTTMP/custompredicate.py: intentional failure of loading extension |
|
2476 | *** failed to import extension custompredicate from $TESTTMP/custompredicate.py: intentional failure of loading extension | |
2477 | hg: parse error: unknown identifier: custom1 |
|
2477 | hg: parse error: unknown identifier: custom1 | |
2478 | [255] |
|
2478 | [255] | |
2479 |
|
2479 | |||
2480 | $ cd .. |
|
2480 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now