← 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-02-11 04:02:41 UTC
  • mfrom: (5017.2.2 tariff)
  • Revision ID: pqm@pqm.ubuntu.com-20100211040241-w6n021dz0uus341n
(mbp) add import-tariff tests

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, format_registry
 
20
from bzrlib.bzrdir import BzrDir, BzrDirFormat, format_registry
21
21
import bzrlib.errors as errors
22
22
from bzrlib.remote import RemoteBzrDir
 
23
from bzrlib.transport import get_transport
23
24
import bzrlib.ui as ui
24
25
 
25
26
 
28
29
    def __init__(self, url, format=None):
29
30
        self.format = format
30
31
        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
34
32
        if isinstance(self.bzrdir, RemoteBzrDir):
35
33
            self.bzrdir._ensure_real()
36
34
            self.bzrdir = self.bzrdir._real_bzrdir
37
35
        if self.bzrdir.root_transport.is_readonly():
38
36
            raise errors.UpgradeReadonly
39
37
        self.transport = self.bzrdir.root_transport
40
 
        ui.ui_factory.suppressed_warnings.add(warning_id)
41
 
        try:
42
 
            self.convert()
43
 
        finally:
44
 
            if not saved_warning:
45
 
                ui.ui_factory.suppressed_warnings.remove(warning_id)
 
38
        self.convert()
46
39
 
47
40
    def convert(self):
48
41
        try:
49
42
            branch = self.bzrdir.open_branch()
50
 
            if branch.user_url != self.bzrdir.user_url:
 
43
            if branch.bzrdir.root_transport.base != \
 
44
                self.bzrdir.root_transport.base:
51
45
                ui.ui_factory.note("This is a checkout. The branch (%s) needs to be "
52
46
                             "upgraded separately." %
53
 
                             branch.user_url)
 
47
                             branch.bzrdir.root_transport.base)
54
48
            del branch
55
49
        except (errors.NotBranchError, errors.IncompatibleRepositories):
56
50
            # might not be a format we can open without upgrading; see e.g.