← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

  • Committer: John Arbash Meinel
  • Date: 2009-03-27 22:29:55 UTC
  • mto: (3735.39.2 clean)
  • mto: This revision was merged to the branch mainline in revision 4280.
  • Revision ID: john@arbash-meinel.com-20090327222955-utifmfm888zerixt
Implement apply_delta_to_source which doesn't have to malloc another string.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/upgrade.py
17
17
"""bzr upgrade logic."""
18
18
 
19
19
 
20
 
from bzrlib.bzrdir import BzrDir, BzrDirFormat, format_registry
 
20
from bzrlib.bzrdir import BzrDir, BzrDirFormat
21
21
import bzrlib.errors as errors
22
22
from bzrlib.remote import RemoteBzrDir
23
23
from bzrlib.transport import get_transport
26
26
 
27
27
class Convert(object):
28
28
 
29
 
    def __init__(self, url, format=None):
 
29
    def __init__(self, url, format):
 
30
        if format is None:
 
31
            format = BzrDirFormat.get_default_format()
30
32
        self.format = format
31
33
        self.bzrdir = BzrDir.open_unsupported(url)
32
34
        if isinstance(self.bzrdir, RemoteBzrDir):
54
56
            # might not be a format we can open without upgrading; see e.g.
55
57
            # https://bugs.launchpad.net/bzr/+bug/253891
56
58
            pass
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):
 
59
        if not self.bzrdir.needs_format_conversion(self.format):
70
60
            raise errors.UpToDateFormat(self.bzrdir._format)
71
61
        if not self.bzrdir.can_convert_format():
72
62
            raise errors.BzrError("cannot upgrade from bzrdir format %s" %
73
63
                           self.bzrdir._format)
74
 
        self.bzrdir.check_conversion_target(format)
 
64
        self.bzrdir.check_conversion_target(self.format)
75
65
        self.pb.note('starting upgrade of %s', self.transport.base)
76
66
        self.bzrdir.backup_bzrdir()
77
 
        while self.bzrdir.needs_format_conversion(format):
78
 
            converter = self.bzrdir._format.get_converter(format)
 
67
        while self.bzrdir.needs_format_conversion(self.format):
 
68
            converter = self.bzrdir._format.get_converter(self.format)
79
69
            self.bzrdir = converter.convert(self.bzrdir, self.pb)
80
70
        self.pb.note("finished")
81
71