# 
# 
# patch "ChangeLog"
#  from [9d33622514bbe57d56c932ce2ff10b4ce419024b]
#    to [745378c83b0f2b6e1fa4fdca85bbf5d50c9c8c6e]
# 
# patch "monotone.cc"
#  from [91e984161a12e1b357bb08a9d03ccb8cf963321c]
#    to [bf786be1ac615150c941efc71f807b6bd7dd1742]
# 
# patch "options.hh"
#  from [2d653b7914da4d1fa549232e337c4dcdec0711be]
#    to [a093ddbe1d7f14fa737498deeecd16b099ea45d7]
# 
# patch "sanity.cc"
#  from [2256e669d5c641c396efe0668fdf2a8fcff27215]
#    to [bf8808adbc334786b458a370f14fa777c304f8b7]
# 
# patch "sanity.hh"
#  from [f8046e3979bfeaee7e412a99893fb04dc257f7b9]
#    to [3a383c56e35f90f08f81b3362f448521ad06904a]
# 
============================================================
--- ChangeLog	9d33622514bbe57d56c932ce2ff10b4ce419024b
+++ ChangeLog	745378c83b0f2b6e1fa4fdca85bbf5d50c9c8c6e
@@ -1,3 +1,9 @@
+2006-05-19  Richard Levitte  <address@hidden>
+
+	* monotone.cc, options.hh, sanity.cc, sanity.hh: Do not suppress
+	warnings when --quiet is given.  Add --reallyquiet which does
+	suppress warnings as well as everything that --quiet suppresses.
+
 2006-05-18  Richard Levitte  <address@hidden>
 
 	* po/sv.po: Forgot to unfuzzy a string.
============================================================
--- monotone.cc	91e984161a12e1b357bb08a9d03ccb8cf963321c
+++ monotone.cc	bf786be1ac615150c941efc71f807b6bd7dd1742
@@ -89,7 +89,8 @@
     {"debug", 0, POPT_ARG_NONE, NULL, OPT_DEBUG, gettext_noop("print debug log to stderr while running"), NULL},
     {"dump", 0, POPT_ARG_STRING, &argstr, OPT_DUMP, gettext_noop("file to dump debugging log to, on failure"), NULL},
     {"log", 0, POPT_ARG_STRING, &argstr, OPT_LOG, gettext_noop("file to write the log to"), NULL},
-    {"quiet", 0, POPT_ARG_NONE, NULL, OPT_QUIET, gettext_noop("suppress log and progress messages"), NULL},
+    {"quiet", 0, POPT_ARG_NONE, NULL, OPT_QUIET, gettext_noop("suppress verbose, informational and progress messages"), NULL},
+    {"reallyquiet", 0, POPT_ARG_NONE, NULL, OPT_REALLYQUIET, gettext_noop("suppress warning, verbose, informational and progress messages"), NULL},
     {"help", 'h', POPT_ARG_NONE, NULL, OPT_HELP, gettext_noop("display help message"), NULL},
     {"version", 0, POPT_ARG_NONE, NULL, OPT_VERSION, gettext_noop("print version number, then exit"), NULL},
     {"full-version", 0, POPT_ARG_NONE, NULL, OPT_FULL_VERSION, gettext_noop("print detailed version number, then exit"), NULL},
@@ -336,6 +337,11 @@
               ui.set_tick_writer(new tick_write_nothing);
               break;
 
+            case OPT_REALLYQUIET:
+              global_sanity.set_reallyquiet();
+              ui.set_tick_writer(new tick_write_nothing);
+              break;
+
             case OPT_NOSTD:
               app.set_stdhooks(false);
               break;
============================================================
--- options.hh	2d653b7914da4d1fa549232e337c4dcdec0711be
+++ options.hh	a093ddbe1d7f14fa737498deeecd16b099ea45d7
@@ -54,3 +54,4 @@
 #define OPT_NO_FILES 45
 #define OPT_LOG 46
 #define OPT_RECURSIVE 47
+#define OPT_REALLYQUIET 48
============================================================
--- sanity.cc	2256e669d5c641c396efe0668fdf2a8fcff27215
+++ sanity.cc	bf8808adbc334786b458a370f14fa777c304f8b7
@@ -30,7 +30,7 @@
 sanity global_sanity;
 
 sanity::sanity() : 
-  debug(false), quiet(false), relaxed(false), logbuf(0xffff), 
+  debug(false), quiet(false), reallyquiet(false), relaxed(false), logbuf(0xffff), 
   already_dumping(false), clean_shutdown(false)
 {
   std::string flavour;
@@ -67,6 +67,7 @@
 sanity::set_debug()
 {
   quiet = false;
+  reallyquiet = false;
   debug = true;
 
   // it is possible that some pre-setting-of-debug data
@@ -91,9 +92,18 @@
 {
   debug = false;
   quiet = true;
+  reallyquiet = false;
 }
 
 void 
+sanity::set_quiet()
+{
+  debug = false;
+  quiet = true;
+  reallyquiet = true;
+}
+
+void 
 sanity::set_relaxed(bool rel)
 {
   relaxed = rel;
@@ -177,7 +187,7 @@
   copy(str2.begin(), str2.end(), back_inserter(logbuf));
   if (str[str.size() - 1] != '\n')
     logbuf.push_back('\n');
-  if (! quiet)
+  if (! reallyquiet)
     ui.warn(str);
 }
 
============================================================
--- sanity.hh	f8046e3979bfeaee7e412a99893fb04dc257f7b9
+++ sanity.hh	3a383c56e35f90f08f81b3362f448521ad06904a
@@ -54,11 +54,13 @@
   void set_debug();
   void set_brief();
   void set_quiet();
+  void set_reallyquiet();
   void set_relaxed(bool rel);
 
   bool debug;
   bool brief;
   bool quiet;
+  bool reallyquiet;
   bool relaxed;
   boost::circular_buffer<char> logbuf;
   system_path filename;