← 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: 2009-07-07 04:32:13 UTC
  • mto: This revision was merged to the branch mainline in revision 4524.
  • Revision ID: robertc@robertcollins.net-20090707043213-4hjjhgr40iq7gk2d
More informative assertions in xml serialisation.

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, 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
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, BzrDirFormat, format_registry
23
21
import bzrlib.errors as errors
 
22
from bzrlib.remote import RemoteBzrDir
24
23
from bzrlib.transport import get_transport
25
24
import bzrlib.ui as ui
26
25
 
27
26
 
28
27
class Convert(object):
29
28
 
30
 
    def __init__(self, url, format):
 
29
    def __init__(self, url, format=None):
31
30
        self.format = format
32
31
        self.bzrdir = BzrDir.open_unsupported(url)
 
32
        if isinstance(self.bzrdir, RemoteBzrDir):
 
33
            self.bzrdir._ensure_real()
 
34
            self.bzrdir = self.bzrdir._real_bzrdir
33
35
        if self.bzrdir.root_transport.is_readonly():
34
36
            raise errors.UpgradeReadonly
35
37
        self.transport = self.bzrdir.root_transport
47
49
                self.pb.note("This is a checkout. The branch (%s) needs to be "
48
50
                             "upgraded separately.",
49
51
                             branch.bzrdir.root_transport.base)
50
 
        except errors.NotBranchError:
 
52
            del branch
 
53
        except (errors.NotBranchError, errors.IncompatibleRepositories):
 
54
            # might not be a format we can open without upgrading; see e.g.
 
55
            # https://bugs.launchpad.net/bzr/+bug/253891
51
56
            pass
52
 
        if not self.bzrdir.needs_format_conversion(self.format):
 
57
        if self.format is None:
 
58
            try:
 
59
                rich_root = self.bzrdir.find_repository()._format.rich_root_data
 
60
            except errors.NoRepositoryPresent:
 
61
                rich_root = False # assume no rich roots
 
62
            if rich_root:
 
63
                format_name = "default-rich-root"
 
64
            else:
 
65
                format_name = "default"
 
66
            format = format_registry.make_bzrdir(format_name)
 
67
        else:
 
68
            format = self.format
 
69
        if not self.bzrdir.needs_format_conversion(format):
53
70
            raise errors.UpToDateFormat(self.bzrdir._format)
54
71
        if not self.bzrdir.can_convert_format():
55
 
            raise errors.BzrError("cannot upgrade from branch format %s" %
 
72
            raise errors.BzrError("cannot upgrade from bzrdir format %s" %
56
73
                           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)
 
74
        self.bzrdir.check_conversion_target(format)
62
75
        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)
 
76
        self.bzrdir.backup_bzrdir()
 
77
        while self.bzrdir.needs_format_conversion(format):
 
78
            converter = self.bzrdir._format.get_converter(format)
66
79
            self.bzrdir = converter.convert(self.bzrdir, self.pb)
67
80
        self.pb.note("finished")
68
81
 
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
82
 
78
83
def upgrade(url, format=None):
79
84
    """Upgrade to format, or the default bzrdir format if not supplied."""