/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/blackbox/test_upgrade.py

  • Committer: Jelmer Vernooij
  • Date: 2020-04-05 19:11:34 UTC
  • mto: (7490.7.16 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200405191134-0aebh8ikiwygxma5
Populate the .gitignore file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_upgrade.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2011 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
18
18
import os
19
19
import stat
20
20
 
21
 
from bzrlib import (
 
21
from breezy import (
 
22
    bzr,
 
23
    controldir,
 
24
    lockable_files,
 
25
    ui,
 
26
    urlutils,
 
27
    )
 
28
from breezy.bzr import (
22
29
    bzrdir,
23
 
    repository,
24
30
    )
25
 
from bzrlib.tests import (
 
31
from breezy.tests import (
26
32
    features,
27
 
    TestCaseInTempDir,
28
33
    TestCaseWithTransport,
29
34
    )
30
 
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
31
 
from bzrlib.transport import get_transport
32
 
from bzrlib.repofmt.knitrepo import (
33
 
    RepositoryFormatKnit1,
34
 
    )
 
35
from breezy.tests.test_sftp_transport import TestCaseWithSFTPServer
 
36
from breezy.bzr.knitpack_repo import RepositoryFormatKnitPack1
 
37
 
 
38
 
 
39
class OldBzrDir(bzrdir.BzrDirMeta1):
 
40
    """An test brz dir implementation"""
 
41
 
 
42
    def needs_format_conversion(self, format):
 
43
        return not isinstance(format, self.__class__)
 
44
 
 
45
 
 
46
class ConvertOldTestToMeta(controldir.Converter):
 
47
    """A trivial converter, used for testing."""
 
48
 
 
49
    def convert(self, to_convert, pb):
 
50
        ui.ui_factory.note('starting upgrade from old test format to 2a')
 
51
        to_convert.control_transport.put_bytes(
 
52
            'branch-format',
 
53
            bzrdir.BzrDirMetaFormat1().get_format_string(),
 
54
            mode=to_convert._get_file_mode())
 
55
        return controldir.ControlDir.open(to_convert.user_url)
 
56
 
 
57
 
 
58
class OldBzrDirFormat(bzrdir.BzrDirMetaFormat1):
 
59
 
 
60
    _lock_class = lockable_files.TransportLock
 
61
 
 
62
    def get_converter(self, format=None):
 
63
        return ConvertOldTestToMeta()
 
64
 
 
65
    @classmethod
 
66
    def get_format_string(cls):
 
67
        return b"Ancient Test Format"
 
68
 
 
69
    def _open(self, transport):
 
70
        return OldBzrDir(transport, self)
35
71
 
36
72
 
37
73
class TestWithUpgradableBranches(TestCaseWithTransport):
38
74
 
39
75
    def setUp(self):
40
76
        super(TestWithUpgradableBranches, self).setUp()
41
 
        self.addCleanup(bzrdir.BzrDirFormat._set_default_format,
42
 
                        bzrdir.BzrDirFormat.get_default_format())
43
77
 
44
78
    def make_current_format_branch_and_checkout(self):
45
79
        current_tree = self.make_branch_and_tree('current_format_branch',
47
81
        current_tree.branch.create_checkout(
48
82
            self.get_url('current_format_checkout'), lightweight=True)
49
83
 
50
 
    def make_format_5_branch(self):
51
 
        # setup a format 5 branch we can upgrade from.
52
 
        self.make_branch_and_tree('format_5_branch',
53
 
                                  format=bzrdir.BzrDirFormat5())
54
 
 
55
 
    def make_metadir_weave_branch(self):
56
 
        self.make_branch_and_tree('metadir_weave_branch', format='metaweave')
57
 
 
58
84
    def test_readonly_url_error(self):
59
 
        self.make_format_5_branch()
 
85
        self.make_branch_and_tree("old_format_branch", format="knit")
60
86
        (out, err) = self.run_bzr(
61
 
            ['upgrade', self.get_readonly_url('format_5_branch')], retcode=3)
62
 
        self.assertEqual(out, "")
63
 
        self.assertEqual(err, "bzr: ERROR: Upgrade URL cannot work with readonly URLs.\n")
 
87
            ['upgrade', self.get_readonly_url("old_format_branch")], retcode=3)
 
88
        err_msg = 'Upgrade URL cannot work with readonly URLs.'
 
89
        self.assertEqualDiff('conversion error: %s\nbrz: ERROR: %s\n'
 
90
                             % (err_msg, err_msg),
 
91
                             err)
64
92
 
65
93
    def test_upgrade_up_to_date(self):
66
94
        self.make_current_format_branch_and_checkout()
67
95
        # when up to date we should get a message to that effect
68
 
        (out, err) = self.run_bzr('upgrade current_format_branch', retcode=3)
69
 
        self.assertEqual("", out)
70
 
        self.assertEqualDiff("bzr: ERROR: The branch format Meta "
71
 
                             "directory format 1 is already at the most "
72
 
                             "recent format.\n", err)
 
96
        burl = self.get_transport('current_format_branch').local_abspath(".")
 
97
        (out, err) = self.run_bzr('upgrade current_format_branch', retcode=0)
 
98
        self.assertEqual(
 
99
            'Upgrading branch %s/ ...\n'
 
100
            'The branch format %s is already at the most recent format.\n'
 
101
            % (burl, 'Meta directory format 1'),
 
102
            out)
73
103
 
74
104
    def test_upgrade_up_to_date_checkout_warns_branch_left_alone(self):
75
105
        self.make_current_format_branch_and_checkout()
76
106
        # when upgrading a checkout, the branch location and a suggestion
77
107
        # to upgrade it should be emitted even if the checkout is up to
78
108
        # date
79
 
        (out, err) = self.run_bzr('upgrade current_format_checkout', retcode=3)
80
 
        self.assertEqual("This is a checkout. The branch (%s) needs to be "
81
 
                         "upgraded separately.\n"
82
 
                         % get_transport(self.get_url('current_format_branch')).base,
83
 
                         out)
84
 
        self.assertEqualDiff("bzr: ERROR: The branch format Meta "
85
 
                             "directory format 1 is already at the most "
86
 
                             "recent format.\n", err)
 
109
        burl = self.get_transport('current_format_branch').local_abspath(".")
 
110
        curl = self.get_transport('current_format_checkout').local_abspath(".")
 
111
        (out, err) = self.run_bzr('upgrade current_format_checkout', retcode=0)
 
112
        self.assertEqual(
 
113
            'Upgrading branch %s/ ...\nThis is a checkout.'
 
114
            ' The branch (%s/) needs to be upgraded separately.\n'
 
115
            'The branch format %s is already at the most recent format.\n'
 
116
            % (curl, burl, 'Meta directory format 1'),
 
117
            out)
87
118
 
88
119
    def test_upgrade_checkout(self):
89
120
        # upgrading a checkout should work
94
125
        # anonymous branch
95
126
        pass
96
127
 
97
 
    def test_ugrade_branch_in_repo(self):
 
128
    def test_upgrade_branch_in_repo(self):
98
129
        # upgrading a branch in a repo should warn about not upgrading the repo
99
130
        pass
100
131
 
101
 
    def test_upgrade_explicit_metaformat(self):
102
 
        # users can force an upgrade to metadir format.
103
 
        self.make_format_5_branch()
104
 
        url = get_transport(self.get_url('format_5_branch')).base
 
132
    def test_upgrade_control_dir(self):
 
133
        old_format = OldBzrDirFormat()
 
134
        self.addCleanup(bzr.BzrProber.formats.remove,
 
135
                        old_format.get_format_string())
 
136
        bzr.BzrProber.formats.register(old_format.get_format_string(),
 
137
                                       old_format)
 
138
        self.addCleanup(controldir.ControlDirFormat._set_default_format,
 
139
                        controldir.ControlDirFormat.get_default_format())
 
140
 
 
141
        # setup an old format branch we can upgrade from.
 
142
        path = 'old_format_branch'
 
143
        self.make_branch_and_tree(path, format=old_format)
 
144
        transport = self.get_transport(path)
 
145
        url = transport.base
 
146
        display_url = transport.local_abspath('.')
105
147
        # check --format takes effect
106
 
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
 
148
        controldir.ControlDirFormat._set_default_format(old_format)
107
149
        backup_dir = 'backup.bzr.~1~'
108
150
        (out, err) = self.run_bzr(
109
 
            ['upgrade', '--format=metaweave', url])
110
 
        self.assertEqualDiff("""starting upgrade of %s
111
 
making backup of %s.bzr
112
 
  to %s%s
113
 
starting upgrade from format 5 to 6
114
 
adding prefixes to weaves
115
 
adding prefixes to revision-store
116
 
starting upgrade from format 6 to metadir
 
151
            ['upgrade', '--format=2a', url])
 
152
        self.assertEqualDiff("""Upgrading branch %s/ ...
 
153
starting upgrade of %s/
 
154
making backup of %s/.bzr
 
155
  to %s/%s
 
156
starting upgrade from old test format to 2a
117
157
finished
118
 
""" % (url, url, url, backup_dir), out)
 
158
""" % (display_url, display_url, display_url, display_url, backup_dir), out)
119
159
        self.assertEqualDiff("", err)
120
160
        self.assertTrue(isinstance(
121
 
            bzrdir.BzrDir.open(self.get_url('format_5_branch'))._format,
 
161
            controldir.ControlDir.open(self.get_url(path))._format,
122
162
            bzrdir.BzrDirMetaFormat1))
123
163
 
124
164
    def test_upgrade_explicit_knit(self):
125
 
        # users can force an upgrade to knit format from a metadir weave
126
 
        # branch
127
 
        self.make_metadir_weave_branch()
128
 
        url = get_transport(self.get_url('metadir_weave_branch')).base
 
165
        # users can force an upgrade to knit format from a metadir pack 0.92
 
166
        # branch to a 2a branch.
 
167
        self.make_branch_and_tree('branch', format='knit')
 
168
        transport = self.get_transport('branch')
 
169
        url = transport.base
 
170
        display_url = transport.local_abspath('.')
129
171
        # check --format takes effect
130
 
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
131
172
        backup_dir = 'backup.bzr.~1~'
132
173
        (out, err) = self.run_bzr(
133
 
            ['upgrade', '--format=knit', url])
134
 
        self.assertEqualDiff("""starting upgrade of %s
135
 
making backup of %s.bzr
136
 
  to %s%s
 
174
            ['upgrade', '--format=pack-0.92', url])
 
175
        self.assertEqualDiff("""Upgrading branch %s/ ...
 
176
starting upgrade of %s/
 
177
making backup of %s/.bzr
 
178
  to %s/%s
137
179
starting repository conversion
138
180
repository converted
139
181
finished
140
 
""" % (url, url, url, backup_dir), out)
 
182
""" % (display_url, display_url, display_url, display_url, backup_dir),
 
183
            out)
141
184
        self.assertEqualDiff("", err)
142
 
        converted_dir = bzrdir.BzrDir.open(self.get_url('metadir_weave_branch'))
 
185
        converted_dir = controldir.ControlDir.open(self.get_url('branch'))
143
186
        self.assertTrue(isinstance(converted_dir._format,
144
187
                                   bzrdir.BzrDirMetaFormat1))
145
188
        self.assertTrue(isinstance(converted_dir.open_repository()._format,
146
 
                                   RepositoryFormatKnit1))
 
189
                                   RepositoryFormatKnitPack1))
147
190
 
148
191
    def test_upgrade_repo(self):
149
 
        self.run_bzr('init-repository --format=metaweave repo')
150
 
        self.run_bzr('upgrade --format=knit repo')
 
192
        self.run_bzr('init-shared-repository --format=pack-0.92 repo')
 
193
        self.run_bzr('upgrade --format=2a repo')
 
194
 
 
195
    def assertLegalOption(self, option_str):
 
196
        # Confirm that an option is legal. (Lower level tests are
 
197
        # expected to validate the actual functionality.)
 
198
        self.run_bzr('init --format=pack-0.92 branch-foo')
 
199
        self.run_bzr('upgrade --format=2a branch-foo %s' % (option_str,))
 
200
 
 
201
    def assertBranchFormat(self, dir, format):
 
202
        branch = controldir.ControlDir.open_tree_or_branch(self.get_url(dir))[
 
203
            1]
 
204
        branch_format = branch._format
 
205
        meta_format = controldir.format_registry.make_controldir(format)
 
206
        expected_format = meta_format.get_branch_format()
 
207
        self.assertEqual(expected_format, branch_format)
 
208
 
 
209
    def test_upgrade_clean_supported(self):
 
210
        self.assertLegalOption('--clean')
 
211
        self.assertBranchFormat('branch-foo', '2a')
 
212
        backup_bzr_dir = os.path.join("branch-foo", "backup.bzr.~1~")
 
213
        self.assertFalse(os.path.exists(backup_bzr_dir))
 
214
 
 
215
    def test_upgrade_dry_run_supported(self):
 
216
        self.assertLegalOption('--dry-run')
 
217
        self.assertBranchFormat('branch-foo', 'pack-0.92')
151
218
 
152
219
    def test_upgrade_permission_check(self):
153
220
        """'backup.bzr' should retain permissions of .bzr. Bug #262450"""
157
224
        self.run_bzr('init --format=1.6')
158
225
        os.chmod('.bzr', old_perms)
159
226
        self.run_bzr('upgrade')
160
 
        new_perms = os.stat(backup_dir).st_mode & 0777
 
227
        new_perms = os.stat(backup_dir).st_mode & 0o777
161
228
        self.assertTrue(new_perms == old_perms)
162
229
 
163
 
 
164
230
    def test_upgrade_with_existing_backup_dir(self):
165
 
        self.make_format_5_branch()
166
 
        transport = get_transport(self.get_url('format_5_branch'))
167
 
        url = transport.base
168
 
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
 
231
        self.make_branch_and_tree("old_format_branch", format="knit")
 
232
        t = self.get_transport("old_format_branch")
 
233
        url = t.base
 
234
        display_url = t.local_abspath('.')
169
235
        backup_dir1 = 'backup.bzr.~1~'
170
236
        backup_dir2 = 'backup.bzr.~2~'
171
 
        # explicitly create backup_dir1. bzr should create the .~2~ directory
 
237
        # explicitly create backup_dir1. brz should create the .~2~ directory
172
238
        # as backup
173
 
        transport.mkdir(backup_dir1)
 
239
        t.mkdir(backup_dir1)
174
240
        (out, err) = self.run_bzr(
175
 
            ['upgrade', '--format=metaweave', url])
176
 
        self.assertEqualDiff("""starting upgrade of %s
177
 
making backup of %s.bzr
178
 
  to %s%s
179
 
starting upgrade from format 5 to 6
180
 
adding prefixes to weaves
181
 
adding prefixes to revision-store
182
 
starting upgrade from format 6 to metadir
 
241
            ['upgrade', '--format=2a', url])
 
242
        self.assertEqualDiff("""Upgrading branch %s/ ...
 
243
starting upgrade of %s/
 
244
making backup of %s/.bzr
 
245
  to %s/%s
 
246
starting repository conversion
 
247
repository converted
183
248
finished
184
 
""" % (url, url, url, backup_dir2), out)
 
249
""" % (display_url, display_url, display_url, display_url, backup_dir2), out)
185
250
        self.assertEqualDiff("", err)
186
251
        self.assertTrue(isinstance(
187
 
            bzrdir.BzrDir.open(self.get_url('format_5_branch'))._format,
 
252
            controldir.ControlDir.open(
 
253
                self.get_url("old_format_branch"))._format,
188
254
            bzrdir.BzrDirMetaFormat1))
189
 
        self.assertTrue(transport.has(backup_dir2))
 
255
        self.assertTrue(t.has(backup_dir2))
 
256
 
190
257
 
191
258
class SFTPTests(TestCaseWithSFTPServer):
192
259
    """Tests for upgrade over sftp."""
193
260
 
194
261
    def test_upgrade_url(self):
195
 
        self.run_bzr('init --format=weave')
196
 
        t = get_transport(self.get_url())
 
262
        self.run_bzr('init --format=pack-0.92')
 
263
        t = self.get_transport()
197
264
        url = t.base
198
 
        out, err = self.run_bzr(['upgrade', '--format=knit', url])
 
265
        display_url = urlutils.unescape_for_display(url,
 
266
                                                    'utf-8')
 
267
        out, err = self.run_bzr(['upgrade', '--format=2a', url])
199
268
        backup_dir = 'backup.bzr.~1~'
200
 
        self.assertEqualDiff("""starting upgrade of %s
 
269
        self.assertEqualDiff("""Upgrading branch %s ...
 
270
starting upgrade of %s
201
271
making backup of %s.bzr
202
272
  to %s%s
203
 
starting upgrade from format 6 to metadir
204
273
starting repository conversion
205
274
repository converted
206
275
finished
207
 
""" % (url, url, url,backup_dir), out)
 
276
""" % (display_url, display_url, display_url, display_url, backup_dir), out)
208
277
        self.assertEqual('', err)
209
278
 
210
279
 
212
281
 
213
282
    def test_recommend_upgrade_wt4(self):
214
283
        # using a deprecated format gives a warning
215
 
        self.run_bzr('init --knit a')
 
284
        self.run_bzr('init --format=knit a')
216
285
        out, err = self.run_bzr('status a')
217
 
        self.assertContainsRe(err, 'bzr upgrade .*[/\\\\]a')
 
286
        self.assertContainsRe(err, 'brz upgrade .*[/\\\\]a')
218
287
 
219
288
    def test_no_upgrade_recommendation_from_bzrdir(self):
220
289
        # we should only get a recommendation to upgrade when we're accessing
221
290
        # the actual workingtree, not when we only open a bzrdir that contains
222
291
        # an old workngtree
223
 
        self.run_bzr('init --knit a')
 
292
        self.run_bzr('init --format=knit a')
224
293
        out, err = self.run_bzr('revno a')
225
294
        if err.find('upgrade') > -1:
226
295
            self.fail("message shouldn't suggest upgrade:\n%s" % err)