# 
# 
# add_file "tests/t_quiet.at"
#  content [9e4bcadad7f15aa4f5c1cdacf5b3f48b5b397406]
# 
# patch "ChangeLog"
#  from [96326add6188c0ae836e19e174016cbe1c8770ff]
#    to [c66d0310fe8254ce323c78b3d7f2946b42e2fc07]
# 
# patch "monotone.cc"
#  from [2b3a5cd2f5ca0478aabec59c7c770aafdc717ab2]
#    to [3882a5fe2f33a24186ef50f1a6a64e65d13e49a6]
# 
# patch "testsuite.at"
#  from [79d82504789095bb96bdc3c50fd7fbf57b3a51ec]
#    to [697de42304eeb7b0361a9a43ef0edf376c813122]
# 
============================================================
--- tests/t_quiet.at	9e4bcadad7f15aa4f5c1cdacf5b3f48b5b397406
+++ tests/t_quiet.at	9e4bcadad7f15aa4f5c1cdacf5b3f48b5b397406
@@ -0,0 +1,18 @@
+# -*- Autoconf -*-
+
+AT_SETUP([quiet turns off tickers])
+
+MTN_SETUP
+NETSYNC_SETUP
+
+ADD_FILE(input.txt, [version 0 of the file
+])
+COMMIT(testbranch)
+
+NETSYNC_SERVE_START(testbranch)
+
+AT_CHECK(MTN --db=test2.db --keydir=keys2 --rcfile=netsync.lua pull --quiet NETSYNC_ADDRESS testbranch, [], [], [])
+
+NETSYNC_SERVE_STOP
+
+AT_CLEANUP
============================================================
--- ChangeLog	96326add6188c0ae836e19e174016cbe1c8770ff
+++ ChangeLog	c66d0310fe8254ce323c78b3d7f2946b42e2fc07
@@ -1,5 +1,11 @@
 2006-04-25  Timothy Brownawell  <address@hidden>
 
+	* monotone.cc: --quiet forces --ticker=none
+	* tests/t_quiet.at: Check that --quiet turns off tickers.
+	* testsuite.at: Call it.
+
+2006-04-25  Timothy Brownawell  <address@hidden>
+
 	* lua.cc: There is now an "extract_classified_str" to go with
 	"extract_str", which doesn't log the value of the returned string.
 	Use this in hook_get_passphrase.
============================================================
--- monotone.cc	2b3a5cd2f5ca0478aabec59c7c770aafdc717ab2
+++ monotone.cc	3882a5fe2f33a24186ef50f1a6a64e65d13e49a6
@@ -334,6 +334,7 @@
 
             case OPT_QUIET:
               global_sanity.set_quiet();
+              ui.set_tick_writer(new tick_write_nothing);
               break;
 
             case OPT_NOSTD:
@@ -373,12 +374,12 @@
               break;
 
             case OPT_TICKER:
-              if (string(argstr) == "dot")
+              if (string(argstr) == "none" || global_sanity.quiet)
+                ui.set_tick_writer(new tick_write_nothing);
+              else if (string(argstr) == "dot")
                 ui.set_tick_writer(new tick_write_dot);
               else if (string(argstr) == "count")
                 ui.set_tick_writer(new tick_write_count);
-              else if (string(argstr) == "none")
-                ui.set_tick_writer(new tick_write_nothing);
               else
                 requested_help = true;
               break;
============================================================
--- testsuite.at	79d82504789095bb96bdc3c50fd7fbf57b3a51ec
+++ testsuite.at	697de42304eeb7b0361a9a43ef0edf376c813122
@@ -882,3 +882,4 @@
 m4_include(tests/t_ls_epochs.at)
 m4_include(tests/t_hook_helpers.at)
 m4_include(tests/t_no_log_password.at)
+m4_include(tests/t_quiet.at)