← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

  • Committer: Robert Collins
  • Date: 2006-02-17 04:17:09 UTC
  • mto: (1534.1.24 integration)
  • mto: This revision was merged to the branch mainline in revision 1554.
  • Revision ID: robertc@robertcollins.net-20060217041709-7251eb701f69ca7e
Review feedback.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/upgrade.py
42
42
            self.pb.note("This is a checkout. The branch (%s) needs to be "
43
43
                         "upgraded separately.",
44
44
                         branch.bzrdir.root_transport.base)
45
 
        if not self.bzrdir.needs_format_update(self.format):
 
45
        if not self.bzrdir.needs_format_conversion(self.format):
46
46
            raise errors.UpToDateFormat(self.bzrdir._format)
47
 
        if not self.bzrdir.can_update_format():
 
47
        if not self.bzrdir.can_convert_format():
48
48
            raise errors.BzrError("cannot upgrade from branch format %s" %
49
49
                           self.bzrdir._format)
50
50
        self.pb.note('starting upgrade of %s', self.transport.base)
51
51
        self._backup_control_dir()
52
 
        while self.bzrdir.needs_format_update(self.format):
53
 
            converter = self.bzrdir._format.get_updater(self.format)
 
52
        while self.bzrdir.needs_format_conversion(self.format):
 
53
            converter = self.bzrdir._format.get_converter(self.format)
54
54
            self.bzrdir = converter.convert(self.bzrdir, self.pb)
55
55
        self.pb.note("finished")
56
56