← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

  • Committer: Michael Ellerman
  • Date: 2006-02-28 14:45:51 UTC
  • mto: (1558.1.18 Aaron's integration)
  • mto: This revision was merged to the branch mainline in revision 1586.
  • Revision ID: michael@ellerman.id.au-20060228144551-3d9941ecde4a0b0a
Update contrib/pwk for -p1 diffs from bzr

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/upgrade.py
33
33
        if self.bzrdir.root_transport.is_readonly():
34
34
            raise errors.UpgradeReadonly
35
35
        self.transport = self.bzrdir.root_transport
36
 
        self.pb = ui.ui_factory.nested_progress_bar()
37
 
        try:
38
 
            self.convert()
39
 
        finally:
40
 
            self.pb.finished()
 
36
        self.convert()
41
37
 
42
38
    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
 
39
        self.pb = ui.ui_factory.progress_bar()
 
40
        branch = self.bzrdir.open_branch()
 
41
        if branch.bzrdir.root_transport.base != self.bzrdir.root_transport.base:
 
42
            self.pb.note("This is a checkout. The branch (%s) needs to be "
 
43
                         "upgraded separately.",
 
44
                         branch.bzrdir.root_transport.base)
52
45
        if not self.bzrdir.needs_format_conversion(self.format):
53
46
            raise errors.UpToDateFormat(self.bzrdir._format)
54
47
        if not self.bzrdir.can_convert_format():