/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/status.py

  • Committer: Vincent Ladeuil
  • Date: 2010-04-28 10:30:48 UTC
  • mto: (5190.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5191.
  • Revision ID: v.ladeuil+lp@free.fr-20100428103048-hqg32oksuuunesj2
https://launchpad.net/bugs/401599
Fixed as per Andrew's review.

* bzrlib/tests/blackbox/test_push.py:
(TestPushStrictMixin.assertPushFails): Ensure that the error
message mentions --no-strict.
(TestPushStrictMixin.assertPushSucceeds): Rely on branches only to
satisfy dpush needs. Check the warning in the error message.

* bzrlib/tests/blackbox/test_dpush.py:
(TestDpushStrictMixin): Simplified now that the base class do less
assumptions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/status.py
20
20
    delta as _mod_delta,
21
21
    log,
22
22
    osutils,
 
23
    tree,
23
24
    tsort,
24
25
    revision as _mod_revision,
25
26
    )
26
27
import bzrlib.errors as errors
 
28
from bzrlib.osutils import is_inside_any
 
29
from bzrlib.symbol_versioning import (deprecated_function,
 
30
        )
27
31
from bzrlib.trace import mutter, warning
28
32
 
29
33
# TODO: when showing single-line logs, truncate to the width of the terminal