#
#
# patch "monotone.texi"
#  from [b7ff9206e89299dae8f9dd915fbf7e6f4be502cb]
#    to [4b08a6efa1905ac80420a2167bc874c5b9ed8ca1]
# 
# patch "netsync.cc"
#  from [802494ec22ebb2d9c38718680677b9d6bcd5b2ab]
#    to [340e432145bad814c7757dfa04769449745b791f]
# 
# patch "options_list.hh"
#  from [78fbe7c5728513ee672b75d6dcefbc2f508ba915]
#    to [e5965106f0af04336b92b0c0c8ca64148c5ad931]
# 
# patch "ui.cc"
#  from [5c306ceb398f305e5af179008c4bf6165526e87a]
#    to [8544648c4a23b8e79f980da6ed3a4ab81ff0d509]
# 
# patch "ui.hh"
#  from [31deb8bf636c6a0518244e3e7d487d6cb08413a3]
#    to [4ed004af61868096881ebcd9688ba6f880359cdf]
#
============================================================
--- monotone.texi	b7ff9206e89299dae8f9dd915fbf7e6f4be502cb
+++ monotone.texi	4b08a6efa1905ac80420a2167bc874c5b9ed8ca1
@@ -4432,6 +4432,7 @@ @chapter Command Reference
 * Database::                    Manipulation of your database as a whole
 * Automation::                  Running monotone from other programs
 * RCS::                         Importing legacy version control files
+* Global Options::              Options which can be applied on every command
 @end menu
 
 
@@ -8658,7 +8659,7 @@ @section Automation
 @end ftable
 
 @page
address@hidden    RCS,  , Automation, Command Reference
address@hidden    RCS, Global Options , Automation, Command Reference
 @section RCS
 
 @ftable @command
@@ -8688,6 +8689,101 @@ @section RCS
 @end ftable
 
 
address@hidden
address@hidden    Global Options,  , RCS, Command Reference
address@hidden Global Options
+
+Global options can be set for every command at any possible position in the
+command string.
+
address@hidden @option
+
address@hidden --help
address@hidden -h
+Display a help message. This can be applied on single commands as well as
+command groups.
+
address@hidden --confdir <arg>
+Set the location of the configuration directory.
+
address@hidden --no-default-confdir
+Forbid use of the default configuration directory.
+
address@hidden --db <arg>
address@hidden -d <arg>
+Set the name of the database.
+
address@hidden --log <arg>
+Write any output of the command (stdout and stderr) to the specified file.
+
address@hidden --debug
+Print a debug log to stderr while running the command.
+
address@hidden --dump <arg>
+File to dump debugging log to, in case of a failure. This is only used in
+conjunction with @option{--debug}.
+
address@hidden --ignore-suspend-certs
+Do not ignore revisions marked as suspended. See also @command{mtn suspend}.
+
address@hidden --key <arg>
address@hidden -k <arg>
+Set the key used for signatures.
+
address@hidden --keydir <arg>
+Set the location of the key store.
+
address@hidden --norc
+Do not load ~/.monotone/monotonerc or _MTN/monotonerc lua files.
+
address@hidden --rcfile <arg>
+Load an extra configuration file.
+
address@hidden --nostd
+Do not load the standard lua hooks.
+
address@hidden --quiet
+Suppress verbose, informational and progress messages.
+
address@hidden --reallyquiet
+Suppress warning, verbose, informational and progress messages.
+
address@hidden --root <arg>
+Limit the search for a workspace to the specified root directory.
+
address@hidden --ssh-sign <arg>
+Controls the use of ssh-agent.
+Valid arguments are:
address@hidden
address@hidden 'yes': use ssh-agent to make signatures if possible (default)
address@hidden 'no': force use of monotone's internal code
address@hidden 'only': force use of ssh-agent
address@hidden 'check' sign with both, ssh-agent and monotone's internal code, and compare the result
address@hidden itemize
+
address@hidden --ticker <arg>
+Set the ticker style.
+Valid arguments are:
address@hidden
address@hidden 'count': print counts (default)
address@hidden 'dot': print single chars for every tick
address@hidden 'none': no ticker output
address@hidden itemize
+The 'count' ticker type may not show the progress of all tickers which run
+at the same time because of space reasons in the terminal. This is not a problem
+for the 'dot' ticker type or the ticker which is supplied in @command{mtn automate stdio}.
+
address@hidden --version
+Print the version number and exits afterwards. See also @command{mtn version}.
+
address@hidden --xargs <arg>
address@hidden -@@ <arg>
+Insert command line arguments taken from the given file. The file may be stdin
+(-@@-).
+
address@hidden ftable
+
+
 @node    Hook Reference, Special Topics, Command Reference, Top
 @chapter Hook Reference
 
============================================================
--- netsync.cc	802494ec22ebb2d9c38718680677b9d6bcd5b2ab
+++ netsync.cc	340e432145bad814c7757dfa04769449745b791f
@@ -795,6 +795,10 @@ session::setup_client_tickers()
     {
       I(role == source_and_sink_role);
       // xgettext: please use short message and try to avoid multibytes chars
+      cert_in_ticker.reset(new ticker(N_("certs in"), "c", 3, false, true));
+      // xgettext: please use short message and try to avoid multibytes chars
+      cert_out_ticker.reset(new ticker(N_("certs out"), "C", 3, false, true));
+      // xgettext: please use short message and try to avoid multibytes chars
       revision_in_ticker.reset(new ticker(N_("revs in"), "r", 1));
       // xgettext: please use short message and try to avoid multibytes chars
       revision_out_ticker.reset(new ticker(N_("revs out"), "R", 1));
============================================================
--- options_list.hh	78fbe7c5728513ee672b75d6dcefbc2f508ba915
+++ options_list.hh	e5965106f0af04336b92b0c0c8ca64148c5ad931
@@ -284,11 +284,7 @@ GOPT(ssh_sign, "ssh-sign", std::string, 
 #endif
 
 GOPT(ssh_sign, "ssh-sign", std::string, "yes",
-     gettext_noop("controls use of ssh-agent.  valid arguments are: "
-                  "'yes' to use ssh-agent to make signatures if possible, "
-                  "'no' to force use of monotone's internal code, "
-                  "'only' to force use of ssh-agent, "
-                  "'check' to sign with both and compare"))
+     gettext_noop("controls use of ssh-agent (yes|no|only|check)"))
 #ifdef option_bodies
 {
   if (arg.empty())
@@ -297,7 +293,7 @@ GOPT(ssh_sign, "ssh-sign", std::string, 
   if (arg != "yes"
       && arg != "no"
       && arg != "check"
-      && arg != "only") // XXX what does "only" do? not documented
+      && arg != "only")
     throw bad_arg_internal(F("--ssh-sign must be set to 'yes', 'no', "
                              "'only', or 'check'").str());
 
============================================================
--- ui.cc	5c306ceb398f305e5af179008c4bf6165526e87a
+++ ui.cc	8544648c4a23b8e79f980da6ed3a4ab81ff0d509
@@ -65,13 +65,14 @@ ticker::ticker(string const & tickname, 
 };
 
 ticker::ticker(string const & tickname, string const & s, size_t mod,
-    bool kilocount) :
+    bool kilocount, bool skip_display) :
   ticks(0),
   mod(mod),
   total(0),
   previous_total(0),
   kilocount(kilocount),
   use_total(false),
+  may_skip_display(skip_display),
   keyname(tickname),
   name(_(tickname.c_str())),
   shortname(s),
@@ -246,6 +247,12 @@ void tick_write_count::write_ticks()
     {
       ticker * tick = i->second;
 
+      // if the display of this ticker has no great importance, i.e. multiple
+      // other tickers should be displayed at the same time, skip its display
+      // to save space on terminals
+      if (tick->may_skip_display)
+        continue;
+
       if ((tick->count_size == 0 && tick->kilocount)
           ||
           (tick->use_total && tick->previous_total != tick->total))
============================================================
--- ui.hh	31deb8bf636c6a0518244e3e7d487d6cb08413a3
+++ ui.hh	4ed004af61868096881ebcd9688ba6f880359cdf
@@ -25,12 +25,13 @@ struct ticker
   size_t previous_total;
   bool kilocount;
   bool use_total;
+  bool may_skip_display;
   std::string keyname;
   std::string name; // translated name
   std::string shortname;
   size_t count_size;
   ticker(std::string const & n, std::string const & s, size_t mod = 64,
-      bool kilocount=false);
+      bool kilocount=false, bool skip_display=false);
   void set_total(size_t tot) { use_total = true; total = tot; }
   void set_count_size(size_t csiz) { count_size = csiz; }
   void operator++();