← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

  • Committer: Andrew Bennetts
  • Date: 2008-09-05 10:48:03 UTC
  • mto: This revision was merged to the branch mainline in revision 3693.
  • Revision ID: andrew.bennetts@canonical.com-20080905104803-6g72dz6wcldosfs2
Remove monkey-patching of branch._ensure_real from test_remote.py.

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
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
 
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)
 
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)
57
69
        self.pb.note('starting upgrade of %s', self.transport.base)
58
70
        self._backup_control_dir()
59
71
        while self.bzrdir.needs_format_conversion(self.format):
63
75
 
64
76
    def _backup_control_dir(self):
65
77
        self.pb.note('making backup of tree history')
66
 
        self.transport.copy_tree('.bzr', '.bzr.backup')
67
 
        self.pb.note('%s.bzr has been backed up to %s.bzr.backup',
 
78
        self.transport.copy_tree('.bzr', 'backup.bzr')
 
79
        self.pb.note('%s.bzr has been backed up to %sbackup.bzr',
68
80
             self.transport.base,
69
81
             self.transport.base)
70
82
        self.pb.note('if conversion fails, you can move this directory back to .bzr')