← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

  • Committer: Vincent Ladeuil
  • Date: 2010-03-09 15:33:25 UTC
  • mto: (5082.2.1 integration2)
  • mto: This revision was merged to the branch mainline in revision 5084.
  • Revision ID: v.ladeuil+lp@free.fr-20100309153325-w16djg6tbkt0905a
Deprecate Merge3Merger.scalar_three_way.

* bzrlib/merge.py:
(Merge3Merger.scalar_three_way): Deprecated, not used in the
current code base, skimming history seem to reveal it hasn't been
used for quite a long time.

Show diffs side-by-side

added added

removed removed

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