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.
#!/bin/sh
hg init repo
cd repo
echo foo > foo
echo bar > bar
hg ci -qAm 'add foo bar'
echo foo2 >> foo
echo bleh > bar
hg ci -m 'change foo bar'
hg up -qC 0
hg mv foo foo1
echo foo1 > foo1
hg cat foo >> foo1
hg ci -m 'mv foo foo1'
hg merge
hg debugstate --nodates
hg st -q
echo '% removing foo1 and bar'
cp foo1 F
cp bar B
hg rm -f foo1 bar
hg debugstate --nodates
hg st -qC
echo '% readding foo1 and bar'
cp F foo1
cp B bar
hg add -v foo1 bar
hg debugstate --nodates
hg st -qC
echo '% reverting foo1 and bar'
hg revert -vr . foo1 bar
hg debugstate --nodates
hg st -qC
hg diff