← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_info.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-23 19:45:15 UTC
  • mto: This revision was merged to the branch mainline in revision 6486.
  • Revision ID: jelmer@samba.org-20120223194515-1ctgfzj362m0tu0k
Use bzrdir.controldir for generic access to control directories.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_info.py
218
218
        # Branch and bind to standalone, needs upgrade to metadir
219
219
        # (creates backup as unknown)
220
220
        branch1.bzrdir.sprout('bound')
221
 
        knit1_format = bzrdir.format_registry.make_bzrdir('knit')
 
221
        knit1_format = controldir.format_registry.make_bzrdir('knit')
222
222
        upgrade.upgrade('bound', knit1_format)
223
223
        branch3 = controldir.ControlDir.open('bound').open_branch()
224
224
        branch3.bind(branch1)
315
315
        tree5 = branch1.create_checkout('lightcheckout', lightweight=True)
316
316
        branch5 = tree5.branch
317
317
        out, err = self.run_bzr('info -v lightcheckout')
318
 
        if "metaweave" in bzrdir.format_registry:
 
318
        if "metaweave" in controldir.format_registry:
319
319
            format_description = "knit or metaweave"
320
320
        else:
321
321
            format_description = "knit"
533
533
 
534
534
    def test_info_standalone_no_tree(self):
535
535
        # create standalone branch without a working tree
536
 
        format = bzrdir.format_registry.make_bzrdir('default')
 
536
        format = controldir.format_registry.make_bzrdir('default')
537
537
        branch = self.make_branch('branch')
538
538
        repo = branch.repository
539
539
        out, err = self.run_bzr('info branch -v')
562
562
        self.assertEqual('', err)
563
563
 
564
564
    def test_info_shared_repository(self):
565
 
        format = bzrdir.format_registry.make_bzrdir('knit')
 
565
        format = controldir.format_registry.make_bzrdir('knit')
566
566
        transport = self.get_transport()
567
567
 
568
568
        # Create shared repository
858
858
        self.assertEqual('', err)
859
859
 
860
860
    def test_info_shared_repository_with_trees(self):
861
 
        format = bzrdir.format_registry.make_bzrdir('knit')
 
861
        format = controldir.format_registry.make_bzrdir('knit')
862
862
        transport = self.get_transport()
863
863
 
864
864
        # Create shared repository with working trees
1085
1085
        self.assertEqual('', err)
1086
1086
 
1087
1087
    def test_info_shared_repository_with_tree_in_root(self):
1088
 
        format = bzrdir.format_registry.make_bzrdir('knit')
 
1088
        format = controldir.format_registry.make_bzrdir('knit')
1089
1089
        transport = self.get_transport()
1090
1090
 
1091
1091
        # Create shared repository with working trees
1153
1153
        self.assertEqual('', err)
1154
1154
 
1155
1155
    def test_info_repository_hook(self):
1156
 
        format = bzrdir.format_registry.make_bzrdir('knit')
 
1156
        format = controldir.format_registry.make_bzrdir('knit')
1157
1157
        def repo_info(repo, stats, outf):
1158
1158
            outf.write("more info\n")
1159
1159
        info.hooks.install_named_hook('repository', repo_info, None)
1182
1182
        self.assertEqual('', err)
1183
1183
 
1184
1184
    def test_info_unshared_repository_with_colocated_branches(self):
1185
 
        format = bzrdir.format_registry.make_bzrdir('development-colo')
 
1185
        format = controldir.format_registry.make_bzrdir('development-colo')
1186
1186
        transport = self.get_transport()
1187
1187
 
1188
1188
        # Create unshared repository