← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

  • Committer: Aaron Bentley
  • Date: 2008-03-11 14:29:08 UTC
  • mto: This revision was merged to the branch mainline in revision 3264.
  • Revision ID: aaron@aaronbentley.com-20080311142908-yyrvcpn2mldt0fnn
Update documentation to reflect conflict-handling difference

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 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""bzr upgrade logic."""
18
18
 
19
 
 
20
 
from bzrlib.bzrdir import BzrDir, format_registry
 
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
21
23
import bzrlib.errors as errors
22
 
from bzrlib.remote import RemoteBzrDir
 
24
from bzrlib.transport import get_transport
23
25
import bzrlib.ui as ui
24
26
 
25
27
 
26
28
class Convert(object):
27
29
 
28
 
    def __init__(self, url, format=None):
 
30
    def __init__(self, url, format):
29
31
        self.format = format
30
32
        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
37
33
        if self.bzrdir.root_transport.is_readonly():
38
34
            raise errors.UpgradeReadonly
39
35
        self.transport = self.bzrdir.root_transport
40
 
        ui.ui_factory.suppressed_warnings.add(warning_id)
 
36
        self.pb = ui.ui_factory.nested_progress_bar()
41
37
        try:
42
38
            self.convert()
43
39
        finally:
44
 
            if not saved_warning:
45
 
                ui.ui_factory.suppressed_warnings.remove(warning_id)
 
40
            self.pb.finished()
46
41
 
47
42
    def convert(self):
48
43
        try:
49
44
            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)
54
 
            del branch
55
 
        except (errors.NotBranchError, errors.IncompatibleRepositories):
56
 
            # might not be a format we can open without upgrading; see e.g.
57
 
            # https://bugs.launchpad.net/bzr/+bug/253891
 
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:
58
51
            pass
59
 
        if self.format is None:
60
 
            try:
61
 
                rich_root = self.bzrdir.find_repository()._format.rich_root_data
62
 
            except errors.NoRepositoryPresent:
63
 
                rich_root = False # assume no rich roots
64
 
            if rich_root:
65
 
                format_name = "default-rich-root"
66
 
            else:
67
 
                format_name = "default"
68
 
            format = format_registry.make_bzrdir(format_name)
69
 
        else:
70
 
            format = self.format
71
 
        if not self.bzrdir.needs_format_conversion(format):
 
52
        if not self.bzrdir.needs_format_conversion(self.format):
72
53
            raise errors.UpToDateFormat(self.bzrdir._format)
73
54
        if not self.bzrdir.can_convert_format():
74
 
            raise errors.BzrError("cannot upgrade from bzrdir format %s" %
 
55
            raise errors.BzrError("cannot upgrade from branch format %s" %
75
56
                           self.bzrdir._format)
76
 
        self.bzrdir.check_conversion_target(format)
77
 
        ui.ui_factory.note('starting upgrade of %s' % self.transport.base)
78
 
 
79
 
        self.bzrdir.backup_bzrdir()
80
 
        while self.bzrdir.needs_format_conversion(format):
81
 
            converter = self.bzrdir._format.get_converter(format)
82
 
            self.bzrdir = converter.convert(self.bzrdir, None)
83
 
        ui.ui_factory.note("finished")
84
 
 
 
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')
85
77
 
86
78
def upgrade(url, format=None):
87
79
    """Upgrade to format, or the default bzrdir format if not supplied."""