← 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: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/upgrade.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2008, 2009, 2010 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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""bzr upgrade logic."""
18
18
 
19
 
# change upgrade from .bzr to create a '.bzr-new', then do a bait and switch.
20
 
 
21
 
 
22
 
from bzrlib.bzrdir import ConvertBzrDir4To5, ConvertBzrDir5To6, BzrDir, BzrDirFormat4, BzrDirFormat5, BzrDirFormat
 
19
 
 
20
from bzrlib.bzrdir import BzrDir, format_registry
23
21
import bzrlib.errors as errors
24
 
from bzrlib.transport import get_transport
 
22
from bzrlib.remote import RemoteBzrDir
25
23
import bzrlib.ui as ui
26
24
 
27
25
 
28
26
class Convert(object):
29
27
 
30
 
    def __init__(self, url, format):
 
28
    def __init__(self, url, format=None):
31
29
        self.format = format
32
30
        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
        if isinstance(self.bzrdir, RemoteBzrDir):
 
35
            self.bzrdir._ensure_real()
 
36
            self.bzrdir = self.bzrdir._real_bzrdir
33
37
        if self.bzrdir.root_transport.is_readonly():
34
38
            raise errors.UpgradeReadonly
35
39
        self.transport = self.bzrdir.root_transport
36
 
        self.pb = ui.ui_factory.nested_progress_bar()
 
40
        ui.ui_factory.suppressed_warnings.add(warning_id)
37
41
        try:
38
42
            self.convert()
39
43
        finally:
40
 
            self.pb.finished()
 
44
            if not saved_warning:
 
45
                ui.ui_factory.suppressed_warnings.remove(warning_id)
41
46
 
42
47
    def convert(self):
43
48
        try:
44
49
            branch = self.bzrdir.open_branch()
45
50
            if branch.bzrdir.root_transport.base != \
46
51
                self.bzrdir.root_transport.base:
47
 
                self.pb.note("This is a checkout. The branch (%s) needs to be "
48
 
                             "upgraded separately.",
 
52
                ui.ui_factory.note("This is a checkout. The branch (%s) needs to be "
 
53
                             "upgraded separately." %
49
54
                             branch.bzrdir.root_transport.base)
50
 
        except errors.NotBranchError:
 
55
            del branch
 
56
        except (errors.NotBranchError, errors.IncompatibleRepositories):
 
57
            # might not be a format we can open without upgrading; see e.g.
 
58
            # https://bugs.launchpad.net/bzr/+bug/253891
51
59
            pass
52
 
        if not self.bzrdir.needs_format_conversion(self.format):
 
60
        if self.format is None:
 
61
            try:
 
62
                rich_root = self.bzrdir.find_repository()._format.rich_root_data
 
63
            except errors.NoRepositoryPresent:
 
64
                rich_root = False # assume no rich roots
 
65
            if rich_root:
 
66
                format_name = "default-rich-root"
 
67
            else:
 
68
                format_name = "default"
 
69
            format = format_registry.make_bzrdir(format_name)
 
70
        else:
 
71
            format = self.format
 
72
        if not self.bzrdir.needs_format_conversion(format):
53
73
            raise errors.UpToDateFormat(self.bzrdir._format)
54
74
        if not self.bzrdir.can_convert_format():
55
 
            raise errors.BzrError("cannot upgrade from branch format %s" %
 
75
            raise errors.BzrError("cannot upgrade from bzrdir format %s" %
56
76
                           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
 
        self.pb.note('starting upgrade of %s', self.transport.base)
63
 
        self._backup_control_dir()
64
 
        while self.bzrdir.needs_format_conversion(self.format):
65
 
            converter = self.bzrdir._format.get_converter(self.format)
66
 
            self.bzrdir = converter.convert(self.bzrdir, self.pb)
67
 
        self.pb.note("finished")
68
 
 
69
 
    def _backup_control_dir(self):
70
 
        self.pb.note('making backup of tree history')
71
 
        self.transport.copy_tree('.bzr', '.bzr.backup')
72
 
        self.pb.note('%s.bzr has been backed up to %s.bzr.backup',
73
 
             self.transport.base,
74
 
             self.transport.base)
75
 
        self.pb.note('if conversion fails, you can move this directory back to .bzr')
76
 
        self.pb.note('if it succeeds, you can remove this directory if you wish')
 
77
        self.bzrdir.check_conversion_target(format)
 
78
        ui.ui_factory.note('starting upgrade of %s' % self.transport.base)
 
79
 
 
80
        self.bzrdir.backup_bzrdir()
 
81
        while self.bzrdir.needs_format_conversion(format):
 
82
            converter = self.bzrdir._format.get_converter(format)
 
83
            self.bzrdir = converter.convert(self.bzrdir, None)
 
84
        ui.ui_factory.note("finished")
 
85
 
77
86
 
78
87
def upgrade(url, format=None):
79
88
    """Upgrade to format, or the default bzrdir format if not supplied."""