Rev 5159: (vila) Fix typo in --strict warnings in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5159 [merge]
revision-id: pqm at pqm.ubuntu.com-20100415084105-vhqkmwm01vy9exmz
parent: pqm at pqm.ubuntu.com-20100414150630-f2y00b4pm6lemb2o
parent: v.ladeuil+lp at free.fr-20100415072323-kd7ycarihg3f6s3q
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2010-04-15 09:41:05 +0100
message:
  (vila) Fix typo in --strict warnings
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
  bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
=== modified file 'NEWS'
--- a/NEWS	2010-04-14 13:49:46 +0000
+++ b/NEWS	2010-04-15 06:47:06 +0000
@@ -40,6 +40,9 @@
 * ``bzrlib.mutabletree.MutableTree.commit`` will now support a passed in
   config as in previous versions of bzrlib. (Robert Collins)
 
+* Fix glitch in the warning about unclean trees display.
+  (Vincent Ladeuil, #562665)
+
 * Help messages generated by ``RegistryOption.from_kwargs`` list the
   switches in alphabetical order, rather than in an undefined order.
   (Martin von Gagern, #559409)

=== modified file 'bzrlib/mutabletree.py'
--- a/bzrlib/mutabletree.py	2010-04-12 16:54:35 +0000
+++ b/bzrlib/mutabletree.py	2010-04-15 06:47:06 +0000
@@ -286,7 +286,7 @@
                 if strict is None:
                     # We don't want to interrupt the user if he expressed no
                     # preference about strict.
-                    trace.warning('%s', (err._format(),))
+                    trace.warning('%s', err._format())
                 else:
                     raise err
 

=== modified file 'bzrlib/tests/blackbox/test_push.py'
--- a/bzrlib/tests/blackbox/test_push.py	2010-04-12 16:41:03 +0000
+++ b/bzrlib/tests/blackbox/test_push.py	2010-04-15 06:47:06 +0000
@@ -673,8 +673,9 @@
             error_regexes = self._default_errors
         else:
             error_regexes = []
-        self.run_bzr(self._default_command + args,
-                     working_dir=self._default_wd, error_regexes=error_regexes)
+        ret = self.run_bzr(self._default_command + args,
+                           working_dir=self._default_wd,
+                           error_regexes=error_regexes)
         if pushed_revid is None:
             pushed_revid = self._default_pushed_revid
         tree_to = workingtree.WorkingTree.open('to')