← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-09-24 09:45:23 UTC
  • mfrom: (4712.1.4 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090924094523-nsz6mp3qwor3xpp3
(mbp) deprecate ProgressTask.note

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/upgrade.py
46
46
            branch = self.bzrdir.open_branch()
47
47
            if branch.bzrdir.root_transport.base != \
48
48
                self.bzrdir.root_transport.base:
49
 
                self.pb.note("This is a checkout. The branch (%s) needs to be "
50
 
                             "upgraded separately.",
 
49
                ui.ui_factory.note("This is a checkout. The branch (%s) needs to be "
 
50
                             "upgraded separately." %
51
51
                             branch.bzrdir.root_transport.base)
52
52
            del branch
53
53
        except (errors.NotBranchError, errors.IncompatibleRepositories):
72
72
            raise errors.BzrError("cannot upgrade from bzrdir format %s" %
73
73
                           self.bzrdir._format)
74
74
        self.bzrdir.check_conversion_target(format)
75
 
        self.pb.note('starting upgrade of %s', self.transport.base)
 
75
        ui.ui_factory.note('starting upgrade of %s' % self.transport.base)
 
76
 
76
77
        self.bzrdir.backup_bzrdir()
77
78
        while self.bzrdir.needs_format_conversion(format):
78
79
            converter = self.bzrdir._format.get_converter(format)
79
80
            self.bzrdir = converter.convert(self.bzrdir, self.pb)
80
 
        self.pb.note("finished")
 
81
        ui.ui_factory.note("finished")
81
82
 
82
83
 
83
84
def upgrade(url, format=None):