tests/test-simplemerge.py.out
author Jun Wu <quark@fb.com>
Sun, 20 Aug 2017 10:55:11 -0700
changeset 34011 1b28525e6698
parent 22023 f18830651811
permissions -rw-r--r--
revset: remove order information from tree (API) Keeping `order` in tree makes AST operation harder. And there could be invalid cases if trees could be generated and compounded freely, like: SetA(order=define) & SetB(order=define) ^^^^^^ couldn't be satisfied This patch changes the code to calculate order on the fly, during tree traversal. Optimization of reordering `and` arguments is preserved by introducing a new internal operation `flipand`. .. api:: revset.stringset() now takes 'order' as the last argument. Differential Revision: https://phab.mercurial-scm.org/D451
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
22023
f18830651811 simplemerge: burn "minimal" feature to the ground
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 4363
diff changeset
     1
................
4363
2e3c54fb79a3 actually port simplemerge to hg
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
     2
----------------------------------------------------------------------
22023
f18830651811 simplemerge: burn "minimal" feature to the ground
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 4363
diff changeset
     3
Ran 16 tests in 0.000s
4363
2e3c54fb79a3 actually port simplemerge to hg
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
     4
2e3c54fb79a3 actually port simplemerge to hg
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
     5
OK