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.
adding foo
% test qpush on empty series
no patches in series
popping bad-patch
popping patch2
popping patch1
patch queue now empty
applying patch1
applying patch2
applying bad-patch
transaction abort!
rollback completed
cleaning up working directory...done
abort: decoding near 'é': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)!
changeset: 0:bbd179dfa0a7
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: add foo
% bar should be gone; other unknown/ignored files should still be around
? untracked-file
I .hgignore
C foo
% preparing qpush of a missing patch
no patches applied
applying patch1
now at: patch1
% now we expect the push to fail, but it should NOT complain about patch1
applying patch2
unable to read patch2
now at: patch1
% preparing qpush of missing patch with no patch applied
popping patch1
patch queue now empty
% qpush should fail the same way as below
applying patch1
unable to read patch1