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
1=== modified file 'NEWS'
2--- NEWS 2010-04-14 13:49:46 +0000
3+++ NEWS 2010-04-15 06:50:35 +0000
4@@ -40,6 +40,9 @@
5 * ``bzrlib.mutabletree.MutableTree.commit`` will now support a passed in
6 config as in previous versions of bzrlib. (Robert Collins)
7
8+* Fix glitch in the warning about unclean trees display.
9+ (Vincent Ladeuil, #562665)
10+
11 * Help messages generated by ``RegistryOption.from_kwargs`` list the
12 switches in alphabetical order, rather than in an undefined order.
13 (Martin von Gagern, #559409)
14
15=== modified file 'bzrlib/mutabletree.py'
16--- bzrlib/mutabletree.py 2010-04-12 16:54:35 +0000
17+++ bzrlib/mutabletree.py 2010-04-15 06:50:35 +0000
18@@ -286,7 +286,7 @@
19 if strict is None:
20 # We don't want to interrupt the user if he expressed no
21 # preference about strict.
22- trace.warning('%s', (err._format(),))
23+ trace.warning('%s', err._format())
24 else:
25 raise err
26
27
28=== modified file 'bzrlib/tests/blackbox/test_push.py'
29--- bzrlib/tests/blackbox/test_push.py 2010-04-12 16:41:03 +0000
30+++ bzrlib/tests/blackbox/test_push.py 2010-04-15 06:50:35 +0000
31@@ -673,8 +673,9 @@
32 error_regexes = self._default_errors
33 else:
34 error_regexes = []
35- self.run_bzr(self._default_command + args,
36- working_dir=self._default_wd, error_regexes=error_regexes)
37+ ret = self.run_bzr(self._default_command + args,
38+ working_dir=self._default_wd,
39+ error_regexes=error_regexes)
40 if pushed_revid is None:
41 pushed_revid = self._default_pushed_revid
42 tree_to = workingtree.WorkingTree.open('to')