/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/bzrdir.py

Merge bzr.dev (via NO_SMART_VFS branch).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
1189
1189
        _found is a private parameter, do not use it.
1190
1190
        """
1191
1191
        if not _found:
1192
 
            assert isinstance(BzrDirFormat.find_format(transport),
1193
 
                              self.__class__)
 
1192
            found_format = BzrDirFormat.find_format(transport)
 
1193
            if not isinstance(found_format, self.__class__):
 
1194
                raise AssertionError("%s was asked to open %s, but it seems to need "
 
1195
                        "format %s" 
 
1196
                        % (self, transport, found_format))
1194
1197
        return self._open(transport)
1195
1198
 
1196
1199
    def _open(self, transport):
1882
1885
                if name in bzrcontents:
1883
1886
                    self.bzrdir.transport.delete(name)
1884
1887
        else:
 
1888
            from bzrlib.workingtree import WorkingTreeFormat3
1885
1889
            self.step('Upgrading working tree')
1886
1890
            self.bzrdir.transport.mkdir('checkout', mode=self.dir_mode)
1887
1891
            self.make_lock('checkout')
1888
1892
            self.put_format(
1889
 
                'checkout', bzrlib.workingtree.WorkingTreeFormat3())
 
1893
                'checkout', WorkingTreeFormat3())
1890
1894
            self.bzrdir.transport.delete_multi(
1891
1895
                self.garbage_inventories, self.pb)
1892
1896
            for entry in checkout_files: