mercurial: comparison tests/test-revset.t

equal deleted inserted replaced

-:72b5f4d53c58
+:1b28525e6698
 $ try --optimize :
 (rangeall
 None)
 * optimized:
 (rangeall
-None
+None)
-define)
 * set:
 <spanset+ 0:10>
 0
 1
 2
 * optimized:
 (keyvalue
 ('symbol', 'foo')
 (func
 ('symbol', '_notpublic')
-None
+None))
-any))
 hg: parse error: can't use a key-value pair in this context
 [255]
 relation-subscript operator has the highest binding strength (as function call):
 * analyzed:
 (relsubscript
 (not
 (func
 ('symbol', 'public')
-None
+None))
-any)
-define)
 ('symbol', 'generations')
-('symbol', '0')
+('symbol', '0'))
-define)
 * optimized:
 (relsubscript
 (func
 ('symbol', '_notpublic')
-None
+None)
-any)
 ('symbol', 'generations')
-('symbol', '0')
+('symbol', '0'))
-define)
 resolution of subscript and relation-subscript ternary operators:
 $ hg debugrevspec -p analyzed 'tip[0]'
 * analyzed:
 (subscript
 ('symbol', 'tip')
-('symbol', '0')
+('symbol', '0'))
-define)
 hg: parse error: can't use a subscript in this context
 [255]
 $ hg debugrevspec -p analyzed 'tip#rel[0]'
 * analyzed:
 (relsubscript
 ('symbol', 'tip')
 ('symbol', 'rel')
-('symbol', '0')
+('symbol', '0'))
-define)
 hg: parse error: unknown identifier: rel
 [255]
 $ hg debugrevspec -p analyzed '(tip#rel)[0]'
 * analyzed:
 (subscript
 (relation
 ('symbol', 'tip')
-('symbol', 'rel')
+('symbol', 'rel'))
-define)
+('symbol', '0'))
-('symbol', '0')
-define)
 hg: parse error: can't use a subscript in this context
 [255]
 $ hg debugrevspec -p analyzed 'tip#rel[0][1]'
 * analyzed:
 (subscript
 (relsubscript
 ('symbol', 'tip')
 ('symbol', 'rel')
-('symbol', '0')
+('symbol', '0'))
-define)
+('symbol', '1'))
-('symbol', '1')
-define)
 hg: parse error: can't use a subscript in this context
 [255]
 $ hg debugrevspec -p analyzed 'tip#rel0#rel1[1]'
 * analyzed:
 (relsubscript
 (relation
 ('symbol', 'tip')
-('symbol', 'rel0')
+('symbol', 'rel0'))
-define)
 ('symbol', 'rel1')
-('symbol', '1')
+('symbol', '1'))
-define)
 hg: parse error: unknown identifier: rel1
 [255]
 $ hg debugrevspec -p analyzed 'tip#rel0[0]#rel1[1]'
 * analyzed:
 (relsubscript
 (relsubscript
 ('symbol', 'tip')
 ('symbol', 'rel0')
-('symbol', '0')
+('symbol', '0'))
-define)
 ('symbol', 'rel1')
-('symbol', '1')
+('symbol', '1'))
-define)
 hg: parse error: unknown identifier: rel1
 [255]
 parse errors of relation, subscript and relation-subscript operators:
 * analyzed:
 (and
 (or
 (list
 ('symbol', '0')
-('symbol', '1'))
+('symbol', '1')))
-define)
 (not
-('symbol', '1')
+('symbol', '1')))
-follow)
-define)
 * optimized:
 (difference
 (func
 ('symbol', '_list')
-('string', '0\x001')
+('string', '0\x001'))
-define)
+('symbol', '1'))
-('symbol', '1')
-define)
 0
 $ hg debugrevspec -p unknown '0'
 abort: invalid stage name: unknown
 [255]
 $ hg debugrevspec --verify -v -p analyzed -p optimized 'r3232() & 2'
 * analyzed:
 (and
 (func
 ('symbol', 'r3232')
-None
+None)
-define)
+('symbol', '2'))
+* optimized:
+(flipand
 ('symbol', '2')
-define)
-* optimized:
-(and
-('symbol', '2')
 (func
 ('symbol', 'r3232')
-None
+None))
-define)
-define)
 * analyzed set:
 <baseset [2]>
 * optimized set:
 <baseset [2, 2]>
 --- analyzed
 * parsed:
 (rangeall
 None)
 * analyzed:
 (rangeall
-None
+None)
-define)
 * set:
 <spanset+ 0:10>
 0
 1
 2
 8
 9
 $ try -p analyzed ':1'
 * analyzed:
 (rangepre
-('symbol', '1')
+('symbol', '1'))
-define)
 * set:
 <spanset+ 0:2>
 0
 1
 $ try -p analyzed ':(1|2)'
 * analyzed:
 (rangepre
 (or
 (list
 ('symbol', '1')
-('symbol', '2'))
+('symbol', '2'))))
-define)
-define)
 * set:
 <spanset+ 0:3>
 0
 1
 2
 $ try -p analyzed ':(1&2)'
 * analyzed:
 (rangepre
 (and
 ('symbol', '1')
-('symbol', '2')
+('symbol', '2')))
-define)
-define)
 * set:
 <baseset []>
 infix/suffix resolution of ^ operator (issue2884):
 (func
 ('symbol', 'only')
 (difference
 (range
 ('symbol', '8')
-('symbol', '9')
+('symbol', '9'))
-define)
+('symbol', '8')))
-('symbol', '8')
-define)
-define)
 * set:
 <baseset+ [8, 9]>
 8
 9
 $ try --optimize '(9)%(5)'
 * optimized:
 (func
 ('symbol', 'only')
 (list
 ('symbol', '9')
-('symbol', '5'))
+('symbol', '5')))
-define)
 * set:
 <baseset+ [2, 4, 8, 9]>
 2
 4
 8
 * optimized:
 (difference
 (and
 (range
 ('symbol', '3')
-('symbol', '0')
+('symbol', '0'))
-define)
 (range
 ('symbol', '0')
-('symbol', '3')
+('symbol', '3')))
-follow)
-define)
 (range
 ('symbol', '2')
-('symbol', '1')
+('symbol', '1')))
-any)
-define)
 * set:
 <filteredset
 <filteredset
 <spanset- 0:4>,
 <spanset+ 0:4>>,
 ('symbol', '2')))))
 * optimized:
 (and
 (range
 ('symbol', '2')
-('symbol', '0')
+('symbol', '0'))
-define)
 (func
 ('symbol', '_list')
-('string', '0\x001\x002')
+('string', '0\x001\x002')))
-follow)
-define)
 * set:
 <filteredset
 <spanset- 0:3>,
 <baseset [0, 1, 2]>>
 2
 ('symbol', '2')))))
 * optimized:
 (and
 (range
 ('symbol', '2')
-('symbol', '0')
+('symbol', '0'))
-define)
 (or
 (list
 (range
 ('symbol', '0')
-('symbol', '1')
+('symbol', '1'))
-follow)
+('symbol', '2'))))
-('symbol', '2'))
-follow)
-define)
 * set:
 <filteredset
 <spanset- 0:3>,
 <addset
 <spanset+ 0:2>,
 ('symbol', '0'))
 (func
 ('symbol', '_intlist')
 ('string', '0\x001\x002')))
 * optimized:
-(and
+(flipand
 (func
 ('symbol', '_intlist')
-('string', '0\x001\x002')
+('string', '0\x001\x002'))
-follow)
 (range
 ('symbol', '2')
-('symbol', '0')
+('symbol', '0')))
-define)
-define)
 * set:
 <filteredset
 <spanset- 0:3>,
 <baseset+ [0, 1, 2]>>
 2
 ('symbol', '0')))
 * optimized:
 (and
 (func
 ('symbol', '_intlist')
-('string', '0\x002\x001')
+('string', '0\x002\x001'))
-define)
 (range
 ('symbol', '2')
-('symbol', '0')
+('symbol', '0')))
-follow)
-define)
 * set:
 <filteredset
 <baseset [0, 2, 1]>,
 <spanset- 0:3>>
 0
 ('string', '*'))) (glob)
 * optimized:
 (and
 (range
 ('symbol', '2')
-('symbol', '0')
+('symbol', '0'))
-define)
 (func
 ('symbol', '_hexlist')
-('string', '*') (glob)
+('string', '*'))) (glob)
-follow)
-define)
 * set:
 <filteredset
 <spanset- 0:3>,
 <baseset [0, 1, 2]>>
 2
 ('string', '*')) (glob)
 (range
 ('symbol', '2')
 ('symbol', '0')))
 * optimized:
-(and
+(flipand
 (range
 ('symbol', '2')
-('symbol', '0')
+('symbol', '0'))
-follow)
 (func
 ('symbol', '_hexlist')
-('string', '*') (glob)
+('string', '*'))) (glob)
-define)
-define)
 * set:
 <baseset [0, 2, 1]>
 0
 2
 1
 $ try -p optimized '2:0 & not (0 + 1)'
 * optimized:
 (difference
 (range
 ('symbol', '2')
-('symbol', '0')
+('symbol', '0'))
-define)
 (func
 ('symbol', '_list')
-('string', '0\x001')
+('string', '0\x001')))
-any)
-define)
 * set:
 <filteredset
 <spanset- 0:3>,
 <not
 <baseset [0, 1]>>>
 $ try -p optimized '2:0 & not (0:2 & (0 + 1))'
 * optimized:
 (difference
 (range
 ('symbol', '2')
-('symbol', '0')
+('symbol', '0'))
-define)
 (and
 (range
 ('symbol', '0')
-('symbol', '2')
+('symbol', '2'))
-any)
 (func
 ('symbol', '_list')
-('string', '0\x001')
+('string', '0\x001'))))
-any)
-any)
-define)
 * set:
 <filteredset
 <spanset- 0:3>,
 <not
 <baseset [0, 1]>>>
 * optimized:
 (func
 ('symbol', 'present')
 (func
 ('symbol', '_list')
-('string', '2\x000\x001')
+('string', '2\x000\x001')))
-define)
-define)
 * set:
 <baseset [2, 0, 1]>
 2
 0
 1
 ('symbol', '2')))))
 * optimized:
 (and
 (range
 ('symbol', '2')
-('symbol', '0')
+('symbol', '0'))
-define)
 (func
 ('symbol', 'present')
 (func
 ('symbol', '_list')
-('string', '0\x001\x002')
+('string', '0\x001\x002'))))
-follow)
-follow)
-define)
 * set:
 <filteredset
 <spanset- 0:3>,
 <baseset [0, 1, 2]>>
 2
 None)))
 * optimized:
 (and
 (range
 ('symbol', '0')
-('symbol', '2')
+('symbol', '2'))
-define)
 (func
 ('symbol', 'reverse')
 (func
 ('symbol', 'all')
-None
+None)))
-define)
-follow)
-define)
 * set:
 <filteredset
 <spanset+ 0:3>,
 <spanset+ 0:10>>
 0
 ('symbol', 'rev')))))
 * optimized:
 (and
 (range
 ('symbol', '0')
-('symbol', '2')
+('symbol', '2'))
-define)
 (func
 ('symbol', 'sort')
 (list
 (func
 ('symbol', 'all')
-None
+None)
-define)
+('string', '-rev'))))
-('string', '-rev'))
-follow)
-define)
 * set:
 <filteredset
 <spanset+ 0:3>,
 <spanset+ 0:10>>
 0
 ('symbol', '2')))))
 * optimized:
 (and
 (range
 ('symbol', '2')
-('symbol', '0')
+('symbol', '0'))
-define)
 (func
 ('symbol', 'first')
 (func
 ('symbol', '_list')
-('string', '1\x000\x002')
+('string', '1\x000\x002'))))
-define)
-follow)
-define)
 * set:
 <filteredset
 <baseset [1]>,
 <spanset- 0:3>>
 1
 ('symbol', '1'))))))
 * optimized:
 (difference
 (range
 ('symbol', '2')
-('symbol', '0')
+('symbol', '0'))
-define)
 (func
 ('symbol', 'last')
 (func
 ('symbol', '_list')
-('string', '0\x002\x001')
+('string', '0\x002\x001'))))
-define)
-any)
-define)
 * set:
 <filteredset
 <spanset- 0:3>,
 <not
 <baseset [1]>>>
 ('symbol', '1'))))))
 * optimized:
 (and
 (range
 ('symbol', '2')
-('symbol', '0')
+('symbol', '0'))
-define)
 (range
 (func
 ('symbol', '_list')
-('string', '1\x000\x002')
+('string', '1\x000\x002'))
-define)
 (func
 ('symbol', '_list')
-('string', '0\x002\x001')
+('string', '0\x002\x001'))))
-define)
-follow)
-define)
 * set:
 <filteredset
 <spanset- 0:3>,
 <baseset [1]>>
 1
-'A & B' can be rewritten as 'B & A' by weight, but that's fine as long as
+'A & B' can be rewritten as 'flipand(B, A)' by weight.
-the ordering rule is determined before the rewrite; in this example,
-'B' follows the order of the initial set, which is the same order as 'A'
-since 'A' also follows the order:
 $ try --optimize 'contains("glob:*") & (2 + 0 + 1)'
 (and
 (func
 ('symbol', 'contains')
 (list
 ('symbol', '2')
 ('symbol', '0')
 ('symbol', '1')))))
 * optimized:
-(and
+(flipand
 (func
 ('symbol', '_list')
-('string', '2\x000\x001')
+('string', '2\x000\x001'))
-follow)
 (func
 ('symbol', 'contains')
-('string', 'glob:*')
+('string', 'glob:*')))
-define)
-define)
 * set:
 <filteredset
 <baseset+ [0, 1, 2]>,
 <contains 'glob:*'>>
 0
 (list
 ('symbol', '0')
 ('symbol', '2')
 ('symbol', '1')))))
 * optimized:
-(and
+(flipand
 (func
 ('symbol', '_list')
-('string', '0\x002\x001')
+('string', '0\x002\x001'))
-follow)
 (func
 ('symbol', 'reverse')
 (func
 ('symbol', 'contains')
-('string', 'glob:*')
+('string', 'glob:*'))))
-define)
-define)
-define)
 * set:
 <filteredset
 <baseset- [0, 1, 2]>,
 <contains 'glob:*'>>
 2
 ('symbol', 'tip')
 ('symbol', 'null')))
 * optimized:
 (func
 ('symbol', '_list')
-('string', '0\x001\x002\x00-2\x00tip\x00null')
+('string', '0\x001\x002\x00-2\x00tip\x00null'))
-define)
 * set:
 <baseset [0, 1, 2, 8, 9, -1]>
 0
 1
 2
 * optimized:
 (or
 (list
 (func
 ('symbol', '_list')
-('string', '0\x001')
+('string', '0\x001'))
-define)
 (range
 ('symbol', '2')
-('symbol', '3')
+('symbol', '3'))))
-define))
-define)
 * set:
 <addset
 <baseset [0, 1]>,
 <spanset+ 2:4>>
 0
 * optimized:
 (or
 (list
 (range
 ('symbol', '0')
-('symbol', '1')
+('symbol', '1'))
-define)
 ('symbol', '2')
 (range
 ('symbol', '3')
-('symbol', '4')
+('symbol', '4'))
-define)
 (func
 ('symbol', '_list')
-('string', '5\x006')
+('string', '5\x006'))))
-define))
-define)
 * set:
 <addset
 <addset
 <spanset+ 0:2>,
 <baseset [2]>>,
 (list
 ('symbol', '0')
 ('symbol', '1')
 ('symbol', '2')
 ('symbol', '3')
-('symbol', '4'))
+('symbol', '4')))
-define)
 * set:
 <addset
 <addset
 <baseset [0]>,
 <baseset [1]>>,
 None)))
 * optimized:
 (or
 (list
 ('symbol', '0')
-None)
+None))
-define)
 hg: parse error: missing argument
 [255]
 test that chained `or` operations never eat up stack (issue4624)
 (uses `0:1` instead of `0` to avoid future optimization of trivial revisions)
 * optimized:
 (func
 ('symbol', 'only')
 (list
 ('symbol', '3')
-('symbol', '1'))
+('symbol', '1')))
-define)
 * set:
 <baseset+ [3]>
 3
 $ try --optimize 'ancestors(1) - ancestors(3)'
 (minus
 * optimized:
 (func
 ('symbol', 'only')
 (list
 ('symbol', '1')
-('symbol', '3'))
+('symbol', '3')))
-define)
 * set:
 <baseset+ []>
 $ try --optimize 'not ::2 and ::6'
 (and
 (not
 * optimized:
 (func
 ('symbol', 'only')
 (list
 ('symbol', '6')
-('symbol', '2'))
+('symbol', '2')))
-define)
 * set:
 <baseset+ [3, 4, 5, 6]>
 3
 4
 5
 * optimized:
 (func
 ('symbol', 'only')
 (list
 ('symbol', '6')
-('symbol', '4'))
+('symbol', '4')))
-define)
 * set:
 <baseset+ [3, 5, 6]>
 3
 5
 6
 (dagrangepre
 ('symbol', '1'))
 (group
 None))
 * optimized:
-(and
+(flipand
 None
 (func
 ('symbol', 'ancestors')
-('symbol', '1')
+('symbol', '1')))
-define)
-define)
 hg: parse error: missing argument
 [255]
 optimization to only() works only if ancestors() takes only one argument
 $ hg debugrevspec -p optimized 'ancestors(6) - ancestors(4, 1)'
 * optimized:
 (difference
 (func
 ('symbol', 'ancestors')
-('symbol', '6')
+('symbol', '6'))
-define)
 (func
 ('symbol', 'ancestors')
 (list
 ('symbol', '4')
-('symbol', '1'))
+('symbol', '1'))))
-any)
-define)
 0
 1
 3
 5
 6
 (difference
 (func
 ('symbol', 'ancestors')
 (list
 ('symbol', '6')
-('symbol', '1'))
+('symbol', '1')))
-define)
 (func
 ('symbol', 'ancestors')
-('symbol', '4')
+('symbol', '4')))
-any)
-define)
 5
 6
 optimization disabled if keyword arguments passed (because we're too lazy
 to support it)
 (difference
 (func
 ('symbol', 'ancestors')
 (keyvalue
 ('symbol', 'set')
-('symbol', '6'))
+('symbol', '6')))
-define)
 (func
 ('symbol', 'ancestors')
 (keyvalue
 ('symbol', 'set')
-('symbol', '4'))
+('symbol', '4'))))
-any)
-define)
 3
 5
 6
 invalid function call should not be optimized to only()

changeset 34011	1b28525e6698
parent 34010	72b5f4d53c58
child 34020	37b82485097f