← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/upgrade.py
76
76
 
77
77
import bzrlib
78
78
from bzrlib.branch import Branch
 
79
import bzrlib.bzrdir as bzrdir
79
80
from bzrlib.bzrdir import BzrDirFormat, BzrDirFormat4, BzrDirFormat5, BzrDirFormat6
 
81
import bzrlib.errors as errors
80
82
from bzrlib.errors import NoSuchFile, UpgradeReadonly
81
83
import bzrlib.hashcache as hashcache
82
84
from bzrlib.lockable_files import LockableFiles
214
216
            note('this branch is in the most current format (%s)', self.old_format)
215
217
            return False
216
218
        if (not isinstance(self.old_format, BzrDirFormat4) and
217
 
            not isinstance(self.old_format, BzrDirFormat5)):
218
 
            raise BzrError("cannot upgrade from branch format %s" %
 
219
            not isinstance(self.old_format, BzrDirFormat5) and
 
220
            not isinstance(self.old_format, bzrdir.BzrDirMetaFormat1)):
 
221
            raise errors.BzrError("cannot upgrade from branch format %s" %
219
222
                           self.branch._branch_format)
220
223
        return True
221
224