40
41
        super(TestWithUpgradableBranches, self).setUp()
 
41
 
        self.addCleanup(bzrdir.BzrDirFormat._set_default_format,
 
42
 
                        bzrdir.BzrDirFormat.get_default_format())
 
44
 
    def make_current_format_branch_and_checkout(self):
 
 
42
        self.old_format = bzrdir.BzrDirFormat.get_default_format()
 
 
43
        self.old_ui_factory = ui.ui_factory
 
 
44
        self.addCleanup(self.restoreDefaults)
 
 
46
        ui.ui_factory = TestUIFactory()
 
 
47
        # setup a format 5 branch we can upgrade from.
 
 
48
        self.make_branch_and_tree('format_5_branch',
 
 
49
                                  format=bzrdir.BzrDirFormat5())
 
45
51
        current_tree = self.make_branch_and_tree('current_format_branch',
 
 
53
        self.make_branch_and_tree('metadir_weave_branch', format='metaweave')
 
47
54
        current_tree.branch.create_checkout(
 
48
55
            self.get_url('current_format_checkout'), lightweight=True)
 
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())
 
55
 
    def make_metadir_weave_branch(self):
 
56
 
        self.make_branch_and_tree('metadir_weave_branch', format='metaweave')
 
 
57
    def restoreDefaults(self):
 
 
58
        ui.ui_factory = self.old_ui_factory
 
 
59
        bzrdir.BzrDirFormat._set_default_format(self.old_format)
 
58
61
    def test_readonly_url_error(self):
 
59
 
        self.make_format_5_branch()
 
60
62
        (out, err) = self.run_bzr(
 
61
63
            ['upgrade', self.get_readonly_url('format_5_branch')], retcode=3)
 
62
64
        self.assertEqual(out, "")
 
63
65
        self.assertEqual(err, "bzr: ERROR: Upgrade URL cannot work with readonly URLs.\n")
 
65
67
    def test_upgrade_up_to_date(self):
 
66
 
        self.make_current_format_branch_and_checkout()
 
67
68
        # when up to date we should get a message to that effect
 
68
69
        (out, err) = self.run_bzr('upgrade current_format_branch', retcode=3)
 
69
70
        self.assertEqual("", out)
 
 
101
101
    def test_upgrade_explicit_metaformat(self):
 
102
102
        # users can force an upgrade to metadir format.
 
103
 
        self.make_format_5_branch()
 
104
103
        url = get_transport(self.get_url('format_5_branch')).base
 
105
104
        # check --format takes effect
 
106
105
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
 
107
 
        backup_dir = 'backup.bzr.~1~'
 
108
106
        (out, err) = self.run_bzr(
 
109
107
            ['upgrade', '--format=metaweave', url])
 
110
108
        self.assertEqualDiff("""starting upgrade of %s
 
111
109
making backup of %s.bzr
 
113
111
starting upgrade from format 5 to 6
 
114
112
adding prefixes to weaves
 
115
113
adding prefixes to revision-store
 
116
114
starting upgrade from format 6 to metadir
 
118
 
""" % (url, url, url, backup_dir), out)
 
 
116
""" % (url, url, url), out)
 
119
117
        self.assertEqualDiff("", err)
 
120
118
        self.assertTrue(isinstance(
 
121
119
            bzrdir.BzrDir.open(self.get_url('format_5_branch'))._format,
 
 
124
122
    def test_upgrade_explicit_knit(self):
 
125
123
        # users can force an upgrade to knit format from a metadir weave
 
127
 
        self.make_metadir_weave_branch()
 
128
125
        url = get_transport(self.get_url('metadir_weave_branch')).base
 
129
126
        # check --format takes effect
 
130
127
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
 
131
 
        backup_dir = 'backup.bzr.~1~'
 
132
128
        (out, err) = self.run_bzr(
 
133
129
            ['upgrade', '--format=knit', url])
 
134
130
        self.assertEqualDiff("""starting upgrade of %s
 
135
131
making backup of %s.bzr
 
137
133
starting repository conversion
 
138
134
repository converted
 
140
 
""" % (url, url, url, backup_dir), out)
 
 
136
""" % (url, url, url), out)
 
141
137
        self.assertEqualDiff("", err)
 
142
138
        converted_dir = bzrdir.BzrDir.open(self.get_url('metadir_weave_branch'))
 
143
139
        self.assertTrue(isinstance(converted_dir._format,
 
 
149
145
        self.run_bzr('init-repository --format=metaweave repo')
 
150
146
        self.run_bzr('upgrade --format=knit repo')
 
152
 
    def test_upgrade_permission_check(self):
 
153
 
        """'backup.bzr' should retain permissions of .bzr. Bug #262450"""
 
154
 
        self.requireFeature(features.posix_permissions_feature)
 
155
 
        old_perms = stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR
 
156
 
        backup_dir = 'backup.bzr.~1~'
 
157
 
        self.run_bzr('init --format=1.6')
 
158
 
        os.chmod('.bzr', old_perms)
 
159
 
        self.run_bzr('upgrade')
 
160
 
        new_perms = os.stat(backup_dir).st_mode & 0777
 
161
 
        self.assertTrue(new_perms == old_perms)
 
164
 
    def test_upgrade_with_existing_backup_dir(self):
 
165
 
        self.make_format_5_branch()
 
166
 
        transport = get_transport(self.get_url('format_5_branch'))
 
168
 
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
 
169
 
        backup_dir1 = 'backup.bzr.~1~'
 
170
 
        backup_dir2 = 'backup.bzr.~2~'
 
171
 
        # explicitly create backup_dir1. bzr should create the .~2~ directory
 
173
 
        transport.mkdir(backup_dir1)
 
174
 
        (out, err) = self.run_bzr(
 
175
 
            ['upgrade', '--format=metaweave', url])
 
176
 
        self.assertEqualDiff("""starting upgrade of %s
 
177
 
making backup of %s.bzr
 
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
 
184
 
""" % (url, url, url, backup_dir2), out)
 
185
 
        self.assertEqualDiff("", err)
 
186
 
        self.assertTrue(isinstance(
 
187
 
            bzrdir.BzrDir.open(self.get_url('format_5_branch'))._format,
 
188
 
            bzrdir.BzrDirMetaFormat1))
 
189
 
        self.assertTrue(transport.has(backup_dir2))
 
191
149
class SFTPTests(TestCaseWithSFTPServer):
 
192
150
    """Tests for upgrade over sftp."""
 
 
153
        super(SFTPTests, self).setUp()
 
 
154
        self.old_ui_factory = ui.ui_factory
 
 
155
        self.addCleanup(self.restoreDefaults)
 
 
157
        ui.ui_factory = TestUIFactory()
 
 
159
    def restoreDefaults(self):
 
 
160
        ui.ui_factory = self.old_ui_factory
 
194
162
    def test_upgrade_url(self):
 
195
163
        self.run_bzr('init --format=weave')
 
196
164
        t = get_transport(self.get_url())
 
198
166
        out, err = self.run_bzr(['upgrade', '--format=knit', url])
 
199
 
        backup_dir = 'backup.bzr.~1~'
 
200
167
        self.assertEqualDiff("""starting upgrade of %s
 
201
168
making backup of %s.bzr
 
203
170
starting upgrade from format 6 to metadir
 
204
171
starting repository conversion
 
205
172
repository converted
 
207
 
""" % (url, url, url,backup_dir), out)
 
 
174
""" % (url, url, url), out)
 
208
175
        self.assertEqual('', err)
 
211
 
class UpgradeRecommendedTests(TestCaseWithTransport):
 
 
178
class UpgradeRecommendedTests(TestCaseInTempDir):
 
213
180
    def test_recommend_upgrade_wt4(self):
 
214
181
        # using a deprecated format gives a warning
 
 
224
191
        out, err = self.run_bzr('revno a')
 
225
192
        if err.find('upgrade') > -1:
 
226
193
            self.fail("message shouldn't suggest upgrade:\n%s" % err)
 
228
 
    def test_upgrade_shared_repo(self):
 
229
 
        repo = self.make_repository('repo', format='2a', shared=True)
 
230
 
        branch = self.make_branch_and_tree('repo/branch', format="pack-0.92")
 
231
 
        self.get_transport('repo/branch/.bzr/repository').delete_tree('.')
 
232
 
        out, err = self.run_bzr(['upgrade'], working_dir='repo/branch')