view tests/test-branchmap.out @ 11148:a912f26777d3

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.

marked working directory as branch æ
adding foo
listening at http://localhost/ (bound to 127.0.0.1)
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
updating to branch æ
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
changeset:   0:867c11ce77b8
branch:      æ
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     foo

pushing to http://localhost:PORT
searching for changes
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files
changeset:   1:58e7c90d67cb
branch:      æ
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     bar

changeset:   0:867c11ce77b8
branch:      æ
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     foo

pushing to ssh://dummy/
searching for changes
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files