← 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: 2008-05-08 04:12:06 UTC
  • mto: This revision was merged to the branch mainline in revision 3415.
  • Revision ID: mbp@sourcefrog.net-20080508041206-tkrr8ucmcyrlzkum
Some review cleanups for assertion removal

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
21
21
 
22
22
from bzrlib.bzrdir import ConvertBzrDir4To5, ConvertBzrDir5To6, BzrDir, BzrDirFormat4, BzrDirFormat5, BzrDirFormat
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
51
47
                self.pb.note("This is a checkout. The branch (%s) needs to be "
52
48
                             "upgraded separately.",
53
49
                             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
 
50
        except errors.NotBranchError:
58
51
            pass
59
52
        if not self.bzrdir.needs_format_conversion(self.format):
60
53
            raise errors.UpToDateFormat(self.bzrdir._format)
61
54
        if not self.bzrdir.can_convert_format():
62
 
            raise errors.BzrError("cannot upgrade from bzrdir format %s" %
 
55
            raise errors.BzrError("cannot upgrade from branch format %s" %
63
56
                           self.bzrdir._format)
64
57
        if self.format is None:
65
58
            target_format = BzrDirFormat.get_default_format()