← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-09-29 22:03:03 UTC
  • mfrom: (5416.2.6 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100929220303-cr95h8iwtggco721
(mbp) Add 'break-lock --force'

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
17
17
"""bzr upgrade logic."""
18
18
 
19
19
 
20
 
from bzrlib.bzrdir import BzrDir, BzrDirFormat, format_registry
 
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
 
29
28
    def __init__(self, url, format=None):
30
29
        self.format = format
31
30
        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
32
34
        if isinstance(self.bzrdir, RemoteBzrDir):
33
35
            self.bzrdir._ensure_real()
34
36
            self.bzrdir = self.bzrdir._real_bzrdir
35
37
        if self.bzrdir.root_transport.is_readonly():
36
38
            raise errors.UpgradeReadonly
37
39
        self.transport = self.bzrdir.root_transport
38
 
        self.pb = ui.ui_factory.nested_progress_bar()
 
40
        ui.ui_factory.suppressed_warnings.add(warning_id)
39
41
        try:
40
42
            self.convert()
41
43
        finally:
42
 
            self.pb.finished()
 
44
            if not saved_warning:
 
45
                ui.ui_factory.suppressed_warnings.remove(warning_id)
43
46
 
44
47
    def convert(self):
45
48
        try:
46
49
            branch = self.bzrdir.open_branch()
47
 
            if branch.bzrdir.root_transport.base != \
48
 
                self.bzrdir.root_transport.base:
49
 
                self.pb.note("This is a checkout. The branch (%s) needs to be "
50
 
                             "upgraded separately.",
51
 
                             branch.bzrdir.root_transport.base)
 
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)
52
54
            del branch
53
55
        except (errors.NotBranchError, errors.IncompatibleRepositories):
54
56
            # might not be a format we can open without upgrading; see e.g.
72
74
            raise errors.BzrError("cannot upgrade from bzrdir format %s" %
73
75
                           self.bzrdir._format)
74
76
        self.bzrdir.check_conversion_target(format)
75
 
        self.pb.note('starting upgrade of %s', self.transport.base)
 
77
        ui.ui_factory.note('starting upgrade of %s' % self.transport.base)
 
78
 
76
79
        self.bzrdir.backup_bzrdir()
77
80
        while self.bzrdir.needs_format_conversion(format):
78
81
            converter = self.bzrdir._format.get_converter(format)
79
 
            self.bzrdir = converter.convert(self.bzrdir, self.pb)
80
 
        self.pb.note("finished")
 
82
            self.bzrdir = converter.convert(self.bzrdir, None)
 
83
        ui.ui_factory.note("finished")
81
84
 
82
85
 
83
86
def upgrade(url, format=None):