← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

  • Committer: Martin Pool
  • Date: 2006-03-21 12:26:54 UTC
  • mto: This revision was merged to the branch mainline in revision 1621.
  • Revision ID: mbp@sourcefrog.net-20060321122654-514047ed65795a17
New developer commands 'weave-list' and 'weave-join'.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/upgrade.py
19
19
# change upgrade from .bzr to create a '.bzr-new', then do a bait and switch.
20
20
 
21
21
 
22
 
from bzrlib.bzrdir import ConvertBzrDir4To5, ConvertBzrDir5To6, BzrDir, BzrDirFormat4, BzrDirFormat5, BzrDirFormat
 
22
from bzrlib.bzrdir import ConvertBzrDir4To5, ConvertBzrDir5To6, BzrDir, BzrDirFormat4, BzrDirFormat5
23
23
import bzrlib.errors as errors
24
24
from bzrlib.transport import get_transport
25
25
import bzrlib.ui as ui
40
40
            self.pb.finished()
41
41
 
42
42
    def convert(self):
43
 
        try:
44
 
            branch = self.bzrdir.open_branch()
45
 
            if branch.bzrdir.root_transport.base != \
46
 
                self.bzrdir.root_transport.base:
47
 
                self.pb.note("This is a checkout. The branch (%s) needs to be "
48
 
                             "upgraded separately.",
49
 
                             branch.bzrdir.root_transport.base)
50
 
        except errors.NotBranchError:
51
 
            pass
 
43
        branch = self.bzrdir.open_branch()
 
44
        if branch.bzrdir.root_transport.base != self.bzrdir.root_transport.base:
 
45
            self.pb.note("This is a checkout. The branch (%s) needs to be "
 
46
                         "upgraded separately.",
 
47
                         branch.bzrdir.root_transport.base)
52
48
        if not self.bzrdir.needs_format_conversion(self.format):
53
49
            raise errors.UpToDateFormat(self.bzrdir._format)
54
50
        if not self.bzrdir.can_convert_format():
55
51
            raise errors.BzrError("cannot upgrade from branch format %s" %
56
52
                           self.bzrdir._format)
57
 
        if self.format is None:
58
 
            target_format = BzrDirFormat.get_default_format()
59
 
        else:
60
 
            target_format = self.format
61
 
        self.bzrdir.check_conversion_target(target_format)
62
53
        self.pb.note('starting upgrade of %s', self.transport.base)
63
54
        self._backup_control_dir()
64
55
        while self.bzrdir.needs_format_conversion(self.format):