← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

  • Committer: Martin Pool
  • Date: 2006-03-03 08:55:34 UTC
  • mto: This revision was merged to the branch mainline in revision 1593.
  • Revision ID: mbp@sourcefrog.net-20060303085534-d24a8118f4ce571a
Add some tests that format7 repo creates the right lock type

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/upgrade.py
1
 
# Copyright (C) 2005, 2008 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
19
19
# change upgrade from .bzr to create a '.bzr-new', then do a bait and switch.
20
20
 
21
21
 
22
 
from bzrlib.bzrdir import ConvertBzrDir4To5, ConvertBzrDir5To6, BzrDir, BzrDirFormat4, BzrDirFormat5, BzrDirFormat
 
22
from bzrlib.bzrdir import ConvertBzrDir4To5, ConvertBzrDir5To6, BzrDir, BzrDirFormat4, BzrDirFormat5
23
23
import bzrlib.errors as errors
24
 
from bzrlib.remote import RemoteBzrDir
25
24
from bzrlib.transport import get_transport
26
25
import bzrlib.ui as ui
27
26
 
31
30
    def __init__(self, url, format):
32
31
        self.format = format
33
32
        self.bzrdir = BzrDir.open_unsupported(url)
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
 
        self.pb = ui.ui_factory.nested_progress_bar()
41
 
        try:
42
 
            self.convert()
43
 
        finally:
44
 
            self.pb.finished()
 
36
        self.convert()
45
37
 
46
38
    def convert(self):
47
 
        try:
48
 
            branch = self.bzrdir.open_branch()
49
 
            if branch.bzrdir.root_transport.base != \
50
 
                self.bzrdir.root_transport.base:
51
 
                self.pb.note("This is a checkout. The branch (%s) needs to be "
52
 
                             "upgraded separately.",
53
 
                             branch.bzrdir.root_transport.base)
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
58
 
            pass
 
39
        self.pb = ui.ui_factory.progress_bar()
 
40
        branch = self.bzrdir.open_branch()
 
41
        if branch.bzrdir.root_transport.base != self.bzrdir.root_transport.base:
 
42
            self.pb.note("This is a checkout. The branch (%s) needs to be "
 
43
                         "upgraded separately.",
 
44
                         branch.bzrdir.root_transport.base)
59
45
        if not self.bzrdir.needs_format_conversion(self.format):
60
46
            raise errors.UpToDateFormat(self.bzrdir._format)
61
47
        if not self.bzrdir.can_convert_format():
62
 
            raise errors.BzrError("cannot upgrade from bzrdir format %s" %
 
48
            raise errors.BzrError("cannot upgrade from branch format %s" %
63
49
                           self.bzrdir._format)
64
 
        if self.format is None:
65
 
            target_format = BzrDirFormat.get_default_format()
66
 
        else:
67
 
            target_format = self.format
68
 
        self.bzrdir.check_conversion_target(target_format)
69
50
        self.pb.note('starting upgrade of %s', self.transport.base)
70
51
        self._backup_control_dir()
71
52
        while self.bzrdir.needs_format_conversion(self.format):
75
56
 
76
57
    def _backup_control_dir(self):
77
58
        self.pb.note('making backup of tree history')
78
 
        self.transport.copy_tree('.bzr', 'backup.bzr')
79
 
        self.pb.note('%s.bzr has been backed up to %sbackup.bzr',
 
59
        self.transport.copy_tree('.bzr', '.bzr.backup')
 
60
        self.pb.note('%s.bzr has been backed up to %s.bzr.backup',
80
61
             self.transport.base,
81
62
             self.transport.base)
82
63
        self.pb.note('if conversion fails, you can move this directory back to .bzr')