/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 breezy/tests/test_bzrdir.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2017-06-06 01:19:54 UTC
  • mfrom: (6653.1.11 bzrbranch)
  • Revision ID: breezy.the.bot@gmail.com-20170606011954-94b4qfphmtka9xp7
Move BzrBranch and BzrBranch implementations to breezy.bzrbranch.

Merged from https://code.launchpad.net/~jelmer/brz/bzrbranch/+merge/325050

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_bzrdir.py
25
25
 
26
26
from .. import (
27
27
    branch,
 
28
    bzrbranch,
28
29
    bzrdir,
29
30
    config,
30
31
    controldir,
42
43
    workingtree_4,
43
44
    )
44
45
import breezy.branch
 
46
import breezy.bzrbranch
45
47
from ..branchfmt.fullhistory import BzrBranchFormat5
46
48
from ..errors import (
47
49
    NotBranchError,
109
111
            'branch6',
110
112
            'breezy.repofmt.knitrepo.RepositoryFormatKnit3',
111
113
            'Experimental successor to knit.  Use at your own risk.',
112
 
            branch_format='breezy.branch.BzrBranchFormat6',
 
114
            branch_format='breezy.bzrbranch.BzrBranchFormat6',
113
115
            experimental=True)
114
116
        bzrdir.register_metadir(my_format_registry,
115
117
            'hidden format',
116
118
            'breezy.repofmt.knitrepo.RepositoryFormatKnit3',
117
119
            'Experimental successor to knit.  Use at your own risk.',
118
 
            branch_format='breezy.branch.BzrBranchFormat6', hidden=True)
 
120
            branch_format='breezy.bzrbranch.BzrBranchFormat6', hidden=True)
119
121
        my_format_registry.register('hiddendeprecated', DeprecatedBzrDirFormat,
120
122
            'Old format.  Slower and does not support things. ', hidden=True)
121
123
        my_format_registry.register_lazy('hiddenlazy', 'breezy.tests.test_bzrdir',
137
139
            knitrepo.RepositoryFormatKnit1)
138
140
        my_bzrdir = my_format_registry.make_bzrdir('branch6')
139
141
        self.assertIsInstance(my_bzrdir.get_branch_format(),
140
 
                              breezy.branch.BzrBranchFormat6)
 
142
                              breezy.bzrbranch.BzrBranchFormat6)
141
143
 
142
144
    def test_get_help(self):
143
145
        my_format_registry = self.make_format_registry()
508
510
        # Make stackable source branch with an unstackable repo format.
509
511
        source_bzrdir = self.make_bzrdir('source')
510
512
        knitpack_repo.RepositoryFormatKnitPack1().initialize(source_bzrdir)
511
 
        source_branch = breezy.branch.BzrBranchFormat7().initialize(
 
513
        source_branch = breezy.bzrbranch.BzrBranchFormat7().initialize(
512
514
            source_bzrdir)
513
515
        # Make a directory with a default stacking policy
514
516
        parent_bzrdir = self.make_bzrdir('parent')