/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/transport/brokenrename.py

  • Committer: Vincent Ladeuil
  • Date: 2009-06-30 15:54:23 UTC
  • mto: (4496.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4497.
  • Revision ID: v.ladeuil+lp@free.fr-20090630155423-afousrl3zrdx0he2
Fixed as per jam's review.

* tests/blackbox/test_push.py:
(load_tests): One more changes type.
(TestPushStrictMixin): Switch to using mixin, it's clearer.
Define some default values as attributes so that they can be
changed more easily.
(TestPushStrictMixin.assertPushFails,
TestPushStrictMixin.assertPushSucceeds): Use default values from
attributes.
(TestPushStrictWithChanges._out_of_sync_trees): Setup a new
context and change the default values.

* errors.py:
(OutOfDateTree, UncommittedChanges): Add a more parameter so more
details can be given.

* builtins.py:
(cmd_push.run): Add an additional check that the tree is still in
sync with its branch before pushing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/brokenrename.py
23
23
        errors,
24
24
        urlutils,
25
25
        )
26
 
from bzrlib.transport import decorator
27
 
 
28
 
 
29
 
class BrokenRenameTransportDecorator(decorator.TransportDecorator):
 
26
from bzrlib.transport.decorator import TransportDecorator, DecoratorServer
 
27
 
 
28
 
 
29
class BrokenRenameTransportDecorator(TransportDecorator):
30
30
    """A transport that fails to detect clashing renames"""
31
31
 
32
32
    @classmethod
46
46
            return
47
47
 
48
48
 
 
49
class BrokenRenameServer(DecoratorServer):
 
50
    """Server for the BrokenRenameTransportDecorator for testing with."""
 
51
 
 
52
    def get_decorator_class(self):
 
53
        return BrokenRenameTransportDecorator
 
54
 
 
55
 
49
56
def get_test_permutations():
50
57
    """Return the permutations to be used in testing."""
51
58
    # we don't use this for general testing, only for the tests that