Bazaar

Merge lp:~vila/bzr/562665-strict-warning-tuple into lp:bzr

  1. 562665-strict-warning-tuple
  2. Merge into bzr.dev
Proposed by Vincent Ladeuil
Status: Merged
Approved by: Martin Pool
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~vila/bzr/562665-strict-warning-tuple
Merge into: lp:bzr
Diff against target: 42 lines (+7/-3)
3 files modified
NEWS (+3/-0)
bzrlib/mutabletree.py (+1/-1)
bzrlib/tests/blackbox/test_push.py (+3/-2)
To merge this branch: bzr merge lp:~vila/bzr/562665-strict-warning-tuple
Reviewer Review Type Date Requested Status
Martin Pool Approve
Review via email: mp+23456@code.launchpad.net

Description of the change

Fix for bug #562665, morale: real-life tests are good too :)

Thanks to Jelmer for the instant feedback.

To post a comment you must log in.
Revision history for this message
Martin Pool (mbp) wrote :

why the test change?

otherwise good

review: Approve
Revision history for this message
Vincent Ladeuil (vila) wrote :

>>>>> Martin Pool <email address hidden> writes:

    > Review: Approve
    > why the test change?

To make it easier to look at the result with pdb. I didn't want to
refine the test to fail, so I just checked that I get the tuple before
fixing the code. I could have reverted it, but since I had a use for
it...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'NEWS'
--- NEWS 2010-04-14 13:49:46 +0000
+++ NEWS 2010-04-15 06:50:35 +0000
@@ -40,6 +40,9 @@
40* ``bzrlib.mutabletree.MutableTree.commit`` will now support a passed in40* ``bzrlib.mutabletree.MutableTree.commit`` will now support a passed in
41 config as in previous versions of bzrlib. (Robert Collins)41 config as in previous versions of bzrlib. (Robert Collins)
4242
43* Fix glitch in the warning about unclean trees display.
44 (Vincent Ladeuil, #562665)
45
43* Help messages generated by ``RegistryOption.from_kwargs`` list the46* Help messages generated by ``RegistryOption.from_kwargs`` list the
44 switches in alphabetical order, rather than in an undefined order.47 switches in alphabetical order, rather than in an undefined order.
45 (Martin von Gagern, #559409)48 (Martin von Gagern, #559409)
4649
=== modified file 'bzrlib/mutabletree.py'
--- bzrlib/mutabletree.py 2010-04-12 16:54:35 +0000
+++ bzrlib/mutabletree.py 2010-04-15 06:50:35 +0000
@@ -286,7 +286,7 @@
286 if strict is None:286 if strict is None:
287 # We don't want to interrupt the user if he expressed no287 # We don't want to interrupt the user if he expressed no
288 # preference about strict.288 # preference about strict.
289 trace.warning('%s', (err._format(),))289 trace.warning('%s', err._format())
290 else:290 else:
291 raise err291 raise err
292292
293293
=== modified file 'bzrlib/tests/blackbox/test_push.py'
--- bzrlib/tests/blackbox/test_push.py 2010-04-12 16:41:03 +0000
+++ bzrlib/tests/blackbox/test_push.py 2010-04-15 06:50:35 +0000
@@ -673,8 +673,9 @@
673 error_regexes = self._default_errors673 error_regexes = self._default_errors
674 else:674 else:
675 error_regexes = []675 error_regexes = []
676 self.run_bzr(self._default_command + args,676 ret = self.run_bzr(self._default_command + args,
677 working_dir=self._default_wd, error_regexes=error_regexes)677 working_dir=self._default_wd,
678 error_regexes=error_regexes)
678 if pushed_revid is None:679 if pushed_revid is None:
679 pushed_revid = self._default_pushed_revid680 pushed_revid = self._default_pushed_revid
680 tree_to = workingtree.WorkingTree.open('to')681 tree_to = workingtree.WorkingTree.open('to')