← 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: 2008-10-30 00:55:00 UTC
  • mto: (3815.2.5 prepare-1.9)
  • mto: This revision was merged to the branch mainline in revision 3811.
  • Revision ID: john@arbash-meinel.com-20081030005500-r5cej1cxflqhs3io
Switch so that we are using a simple timestamp as the first action.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/upgrade.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005, 2008 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
24
25
from bzrlib.transport import get_transport
25
26
import bzrlib.ui as ui
26
27
 
30
31
    def __init__(self, url, format):
31
32
        self.format = format
32
33
        self.bzrdir = BzrDir.open_unsupported(url)
 
34
        if isinstance(self.bzrdir, RemoteBzrDir):
 
35
            self.bzrdir._ensure_real()
 
36
            self.bzrdir = self.bzrdir._real_bzrdir
33
37
        if self.bzrdir.root_transport.is_readonly():
34
38
            raise errors.UpgradeReadonly
35
39
        self.transport = self.bzrdir.root_transport
47
51
                self.pb.note("This is a checkout. The branch (%s) needs to be "
48
52
                             "upgraded separately.",
49
53
                             branch.bzrdir.root_transport.base)
50
 
        except errors.NotBranchError:
 
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
51
58
            pass
52
59
        if not self.bzrdir.needs_format_conversion(self.format):
53
60
            raise errors.UpToDateFormat(self.bzrdir._format)
54
61
        if not self.bzrdir.can_convert_format():
55
 
            raise errors.BzrError("cannot upgrade from branch format %s" %
 
62
            raise errors.BzrError("cannot upgrade from bzrdir format %s" %
56
63
                           self.bzrdir._format)
57
64
        if self.format is None:
58
65
            target_format = BzrDirFormat.get_default_format()