merge: introduce tool.check parameter
tool.check is a list of check options, and can be used in place of
tool.checkchanged and tool.checkconflicts:
Equivalences:
tool.checkchanged = yes
tool.checkconflicts = no
tool.check = changed
tool.checkchanged = no
tool.checkconflicts = yes
tool.check = conflicts
tool.checkchanged = yes
tool.checkconflicts = yes
tool.check = changed, conflicts
Add _toollist() wrapper for ui.configlist() to implement this consistently.
checkchanged and checkconflicts are still supported, but check is
preferred for implementing new check options.
% setup test repo1
adding foo.txt
rev 1
rev 2
rev 3
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
rev 4
rev 5
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
rev 7
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
rev 8
% the story so far
@ 8
|
| o 7
| |
| o 6
|/|
o | 5
| |
o | 4
| |
| o 3
| |
| o 2
|/
o 1
|
o 0
% sanity check of outgoing: expect revs 4 5 6 7 8
requesting all changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 4 changes to 1 files
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
comparing with ../repo2
searching for changes
4
5
6
7
8
% test bundle (destination repo): expect 5 revisions
searching for changes
5 changesets found
% test bundle (base revision): expect 5 revisions
5 changesets found