The unified diff between revisions [38c7ac4f..] and [24fb0b25..] is displayed below. It can also be downloaded as a raw diff.
#
#
# patch "monotone.texi"
# from [012e0b12d0b08056e9513d06bfb108bbb147242e]
# to [b7ff9206e89299dae8f9dd915fbf7e6f4be502cb]
#
# patch "ui.cc"
# from [57359612fa7d6dc7ec77093df261ce76fa08d3aa]
# to [5c306ceb398f305e5af179008c4bf6165526e87a]
#
# patch "ui.hh"
# from [2f9ec93ac4548f59787a0413e2ac404be702a754]
# to [31deb8bf636c6a0518244e3e7d487d6cb08413a3]
#
============================================================
--- monotone.texi 012e0b12d0b08056e9513d06bfb108bbb147242e
+++ monotone.texi b7ff9206e89299dae8f9dd915fbf7e6f4be502cb
@@ -7376,6 +7376,10 @@ @section Automation
output does not get intermixed i.e. at first all definitions are outputted,
afterwards all total_counts, aso.
+ @emph{Note:} The ticker format used for stdio is fixed and cannot be selected
+ explicitely via the global @option{--ticker} option. However, if you run an
+ automate command outside of stdio you can set a different ticker type, f.e.
+ 'count', 'dot' or 'none'.
@end itemize
As needed, some of these (e,w,p) messages may be replaced with structured
============================================================
--- ui.cc 57359612fa7d6dc7ec77093df261ce76fa08d3aa
+++ ui.cc 5c306ceb398f305e5af179008c4bf6165526e87a
@@ -504,7 +504,7 @@ void tick_write_stdio::clear_line()
// global, and we don't want global constructors/destructors doing
// any real work. see monotone.cc for how this is handled.
-user_interface::user_interface() : prog_name("?"), imp(0) {}
+user_interface::user_interface() : prog_name("?"), imp(0), tick_type() {}
void user_interface::initialize()
{
============================================================
--- ui.hh 2f9ec93ac4548f59787a0413e2ac404be702a754
+++ ui.hh 31deb8bf636c6a0518244e3e7d487d6cb08413a3
@@ -75,7 +75,7 @@ private:
struct impl;
impl * imp;
- enum ticker_type {count, dot, stdio, none } tick_type;
+ enum ticker_type { count=1, dot, stdio, none } tick_type;
friend struct ticker;
friend struct tick_write_count;