Rev 2806: selftest --benchmark verbose again by default (Ian Clatworthy) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2806
revision-id: pqm at pqm.ubuntu.com-20070910054843-evbkt0bivtk6tpqu
parent: pqm at pqm.ubuntu.com-20070907145828-hjh5941jv7y8d9z8
parent: ian.clatworthy at internode.on.net-20070910050624-9iwn4y6n8b3fyjwn
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-09-10 06:48:43 +0100
message:
  selftest --benchmark verbose again by default (Ian Clatworthy)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    revno: 2805.1.1
    merged: ian.clatworthy at internode.on.net-20070910050624-9iwn4y6n8b3fyjwn
    parent: pqm at pqm.ubuntu.com-20070907145828-hjh5941jv7y8d9z8
    parent: ian.clatworthy at internode.on.net-20070910021814-fpu0zjjmebnc10tn
    committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
    branch nick: ianc-integration
    timestamp: Mon 2007-09-10 15:06:24 +1000
    message:
      selftest --benchmark verbose again by default (Ian Clatworthy)
    ------------------------------------------------------------
    revno: 2805.2.1
    merged: ian.clatworthy at internode.on.net-20070910021814-fpu0zjjmebnc10tn
    parent: pqm at pqm.ubuntu.com-20070907145828-hjh5941jv7y8d9z8
    committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
    branch nick: bzr.verbose-benchmarks
    timestamp: Mon 2007-09-10 12:18:14 +1000
    message:
      Fix selftest --benchmark so verbose by default again
=== modified file 'NEWS'
--- a/NEWS	2007-09-07 13:33:03 +0000
+++ b/NEWS	2007-09-10 05:06:24 +0000
@@ -123,8 +123,8 @@
    * ``bzr --version`` takes care about encoding of stdout, especially
      when output is redirected. (Alexander Belchenko, #131100)
 
-    * Prompt for an ftp password if none is provided.
-      (Vincent Ladeuil, #137044)
+   * Prompt for an ftp password if none is provided.
+     (Vincent Ladeuil, #137044)
 
   IMPROVEMENTS:
 

=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2007-09-05 08:18:57 +0000
+++ b/bzrlib/builtins.py	2007-09-10 02:18:14 +0000
@@ -2552,7 +2552,7 @@
                      ]
     encoding_type = 'replace'
 
-    def run(self, testspecs_list=None, verbose=None, one=False,
+    def run(self, testspecs_list=None, verbose=False, one=False,
             transport=None, benchmark=None,
             lsprof_timed=None, cache_dir=None,
             first=False, list_only=False,
@@ -2578,14 +2578,12 @@
             pattern = ".*"
         if benchmark:
             test_suite_factory = benchmarks.test_suite
-            if verbose is None:
-                verbose = True
+            # Unless user explicitly asks for quiet, be verbose in benchmarks
+            verbose = not is_quiet()
             # TODO: should possibly lock the history file...
             benchfile = open(".perf_history", "at", buffering=1)
         else:
             test_suite_factory = None
-            if verbose is None:
-                verbose = False
             benchfile = None
         try:
             result = selftest(verbose=verbose,