/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: 2010-01-20 16:05:28 UTC
  • mto: (4973.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4975.
  • Revision ID: v.ladeuil+lp@free.fr-20100120160528-5yo3fbggdp07eovc
Finish the patch based on reviews.

* bzrlib/tests/per_merger.py:
Fix line too long and spurious spaces.

* bzrlib/plugins/news_merge/tests/test_news_merge.py:
(TestFilenameMatchesConfig): Ensure that the params get updated.

* bzrlib/plugins/news_merge/__init__.py:
(filename_matches_config): Save the relevant config variable in
the hook params.
(install_hook): Wrap the hook installation so we can reuse it for
tests.

* bzrlib/plugins/news_merge/README: 
Update the instructions by pointing to the plugin help.

* bzrlib/merge.py:
(MergeHookParams): Delete spurious spaces.

* bzrlib/decorators.py:
(use_pretty_decorators): Mention that we get clearance to copy
launchpad code here (since canonical has copyrights on both code
bases).

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