← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

Cleanup asserts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/upgrade.py
1
 
# Copyright (C) 2005, 2006, 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
"""bzr upgrade logic."""
18
18
 
19
19
 
20
 
from bzrlib.bzrdir import BzrDir, format_registry
 
20
from bzrlib.bzrdir import BzrDir, BzrDirFormat, format_registry
21
21
import bzrlib.errors as errors
22
22
from bzrlib.remote import RemoteBzrDir
 
23
from bzrlib.transport import get_transport
23
24
import bzrlib.ui as ui
24
25
 
25
26
 
28
29
    def __init__(self, url, format=None):
29
30
        self.format = format
30
31
        self.bzrdir = BzrDir.open_unsupported(url)
31
 
        # XXX: Change to cleanup
32
 
        warning_id = 'cross_format_fetch'
33
 
        saved_warning = warning_id in ui.ui_factory.suppressed_warnings
34
32
        if isinstance(self.bzrdir, RemoteBzrDir):
35
33
            self.bzrdir._ensure_real()
36
34
            self.bzrdir = self.bzrdir._real_bzrdir
37
35
        if self.bzrdir.root_transport.is_readonly():
38
36
            raise errors.UpgradeReadonly
39
37
        self.transport = self.bzrdir.root_transport
40
 
        ui.ui_factory.suppressed_warnings.add(warning_id)
 
38
        self.pb = ui.ui_factory.nested_progress_bar()
41
39
        try:
42
40
            self.convert()
43
41
        finally:
44
 
            if not saved_warning:
45
 
                ui.ui_factory.suppressed_warnings.remove(warning_id)
 
42
            self.pb.finished()
46
43
 
47
44
    def convert(self):
48
45
        try:
49
46
            branch = self.bzrdir.open_branch()
50
 
            if branch.user_url != self.bzrdir.user_url:
51
 
                ui.ui_factory.note("This is a checkout. The branch (%s) needs to be "
52
 
                             "upgraded separately." %
53
 
                             branch.user_url)
 
47
            if branch.bzrdir.root_transport.base != \
 
48
                self.bzrdir.root_transport.base:
 
49
                self.pb.note("This is a checkout. The branch (%s) needs to be "
 
50
                             "upgraded separately.",
 
51
                             branch.bzrdir.root_transport.base)
54
52
            del branch
55
53
        except (errors.NotBranchError, errors.IncompatibleRepositories):
56
54
            # might not be a format we can open without upgrading; see e.g.
74
72
            raise errors.BzrError("cannot upgrade from bzrdir format %s" %
75
73
                           self.bzrdir._format)
76
74
        self.bzrdir.check_conversion_target(format)
77
 
        ui.ui_factory.note('starting upgrade of %s' % self.transport.base)
78
 
 
 
75
        self.pb.note('starting upgrade of %s', self.transport.base)
79
76
        self.bzrdir.backup_bzrdir()
80
77
        while self.bzrdir.needs_format_conversion(format):
81
78
            converter = self.bzrdir._format.get_converter(format)
82
 
            self.bzrdir = converter.convert(self.bzrdir, None)
83
 
        ui.ui_factory.note("finished")
 
79
            self.bzrdir = converter.convert(self.bzrdir, self.pb)
 
80
        self.pb.note("finished")
84
81
 
85
82
 
86
83
def upgrade(url, format=None):