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
# b51a8138292a introduced a regression where we would mention in the
# changelog executable files added by the second parent of a merge.
# Test that that doesn't happen anymore
"$TESTDIR/hghave" execbit || exit 80
hg init repo
cd repo
echo foo > foo
hg ci -qAm 'add foo'
echo bar > bar
chmod +x bar
hg ci -qAm 'add bar'
echo '% manifest of p2:'
hg manifest
echo
hg up -qC 0
echo >> foo
hg ci -m 'change foo'
echo '% manifest of p1:'
hg manifest
hg merge
hg ci -m 'merge'
echo '% this should not mention bar:'
hg tip -v
hg debugindex .hg/store/data/bar.i