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

[merge] bzr.dev 2255, resolve conflicts, update copyrights

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/bzrdir_implementations/test_bzrdir.py
17
17
"""Tests for bzrdir implementations - tests a bzrdir format."""
18
18
 
19
19
from cStringIO import StringIO
 
20
import errno
20
21
import os
21
22
from stat import S_ISDIR
22
23
import sys
536
537
        repo = dir.create_repository()
537
538
        repo.fetch(tree.branch.repository)
538
539
        self.assertTrue(repo.has_revision('1'))
 
540
        try:
 
541
            self.assertIs(dir.open_branch().last_revision(), None)
 
542
        except errors.NotBranchError:
 
543
            pass
539
544
        target = self.sproutOrSkip(dir, self.get_url('target'))
540
545
        self.assertNotEqual(dir.transport.base, target.transport.base)
 
546
        # testing inventory isn't reasonable for repositories
541
547
        self.assertDirectoriesEqual(dir.root_transport, target.root_transport,
542
548
                                    ['./.bzr/repository/inventory.knit',
 
549
                                     './.bzr/inventory'
543
550
                                     ])
 
551
        try:
 
552
            # If we happen to have a tree, we'll guarantee everything
 
553
            # except for the tree root is the same.
 
554
            inventory_f = file(dir.transport.base+'inventory', 'rb')
 
555
            self.assertContainsRe(inventory_f.read(), 
 
556
                                  '<inventory file_id="TREE_ROOT[^"]*"'
 
557
                                  ' format="5">\n</inventory>\n')
 
558
            inventory_f.close()
 
559
        except IOError, e:
 
560
            if e.errno != errno.ENOENT:
 
561
                raise
544
562
 
545
563
    def test_sprout_bzrdir_with_repository_to_shared(self):
546
564
        tree = self.make_branch_and_tree('commit_tree')
1243
1261
        dir = self.make_bzrdir('.')
1244
1262
        if dir.can_convert_format():
1245
1263
            # if its default updatable there must be an updater 
1246
 
            # (we change the default to match the lastest known format
1247
 
            # as downgrades may not be available
1248
 
            old_format = bzrdir.BzrDirFormat.get_default_format()
1249
 
            bzrdir.BzrDirFormat.set_default_format(dir._format)
1250
 
            try:
1251
 
                self.assertTrue(isinstance(dir._format.get_converter(),
1252
 
                                           bzrdir.Converter))
1253
 
            finally:
1254
 
                bzrdir.BzrDirFormat.set_default_format(old_format)
 
1264
            # (we force the latest known format as downgrades may not be
 
1265
            # available
 
1266
            self.assertTrue(isinstance(dir._format.get_converter(
 
1267
                format=dir._format), bzrdir.Converter))
1255
1268
        dir.needs_format_conversion(None)
1256
1269
 
1257
1270
    def test_upgrade_new_instance(self):
1263
1276
        self.createWorkingTreeOrSkip(dir)
1264
1277
        if dir.can_convert_format():
1265
1278
            # if its default updatable there must be an updater 
1266
 
            # (we change the default to match the lastest known format
1267
 
            # as downgrades may not be available
1268
 
            old_format = bzrdir.BzrDirFormat.get_default_format()
1269
 
            bzrdir.BzrDirFormat.set_default_format(dir._format)
 
1279
            # (we force the latest known format as downgrades may not be
 
1280
            # available
1270
1281
            pb = ui.ui_factory.nested_progress_bar()
1271
1282
            try:
1272
 
                dir._format.get_converter(None).convert(dir, pb)
 
1283
                dir._format.get_converter(format=dir._format).convert(dir, pb)
1273
1284
            finally:
1274
 
                bzrdir.BzrDirFormat.set_default_format(old_format)
1275
1285
                pb.finished()
1276
1286
            # and it should pass 'check' now.
1277
1287
            check(bzrdir.BzrDir.open(self.get_url('.')).open_branch(), False)