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.
changeset: 0:4cbec7e6f8c4
tag: tip
user: Testing
date: Thu Jan 01 00:00:00 1970 +0000
summary: test
---- HEADERS
200 Script output follows
---- DATA
[('Content-Type', 'application/atom+xml; charset=ascii')]
<?xml version="1.0" encoding="ascii"?>
<feed xmlns="http://www.w3.org/2005/Atom">
<!-- Changelog -->
<id>http://127.0.0.1/</id>
<link rel="self" href="http://127.0.0.1/atom-log"/>
<link rel="alternate" href="http://127.0.0.1/"/>
<title>repo Changelog</title>
<updated>1970-01-01T00:00:00+00:00</updated>
<entry>
<title>test</title>
<id>http://127.0.0.1/#changeset-4cbec7e6f8c42eb52b6b52670e1f7560ae9a101e</id>
<link href="http://127.0.0.1/rev/4cbec7e6f8c4"/>
<author>
<name>Testing</name>
<email>Testing</email>
</author>
<updated>1970-01-01T00:00:00+00:00</updated>
<published>1970-01-01T00:00:00+00:00</published>
<content type="xhtml">
<div xmlns="http://www.w3.org/1999/xhtml">
<pre xml:space="preserve">test</pre>
</div>
</content>
</entry>
</feed>
---- ERRORS
---- HEADERS
200 Script output follows
---- DATA
[('Content-Type', 'text/plain; charset=ascii')]
-rw-r--r-- 4 bar
---- ERRORS
---- HEADERS
200 Script output follows
---- DATA
[('Content-Type', 'text/plain; charset=ascii')]
/repo/
---- ERRORS
---- HEADERS
200 Script output follows
---- DATA
[('Content-Type', 'text/plain; charset=ascii')]
-rw-r--r-- 4 bar
---- ERRORS