← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_reconfigure.py

  • Committer: Vincent Ladeuil
  • Date: 2016-01-21 11:42:23 UTC
  • mto: This revision was merged to the branch mainline in revision 6610.
  • Revision ID: v.ladeuil+lp@free.fr-20160121114223-ngcvndi02ydiqs5z
Allow hyphens in option names to unbreak compatibility.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_reconfigure.py
1
 
# Copyright (C) 2007, 2009 Canonical Ltd
 
1
# Copyright (C) 2007-2012 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
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
from bzrlib import (
18
 
    bzrdir,
 
18
    controldir,
19
19
    errors,
20
20
    tests,
21
21
    workingtree,
22
22
    )
23
 
from bzrlib.branchbuilder import BranchBuilder
24
 
 
25
 
 
26
 
class TestReconfigure(tests.TestCaseWithTransport):
 
23
from bzrlib.tests.script import TestCaseWithTransportAndScript
 
24
 
 
25
 
 
26
class TestReconfigure(TestCaseWithTransportAndScript):
27
27
 
28
28
    def test_no_type(self):
29
29
        branch = self.make_branch('branch')
85
85
 
86
86
    def test_use_shared_to_standalone(self):
87
87
        repo = self.make_repository('repo', shared=True)
88
 
        branch = bzrdir.BzrDir.create_branch_convenience('repo/tree')
 
88
        branch = controldir.ControlDir.create_branch_convenience('repo/tree')
89
89
        self.assertNotEqual(branch.bzrdir.root_transport.base,
90
90
            branch.repository.bzrdir.root_transport.base)
91
91
        self.run_bzr('reconfigure --standalone', working_dir='repo/tree')
125
125
 
126
126
    def test_make_without_trees_leaves_tree_alone(self):
127
127
        repo = self.make_repository('repo', shared=True)
128
 
        branch = bzrdir.BzrDir.create_branch_convenience('repo/branch')
 
128
        branch = controldir.ControlDir.create_branch_convenience('repo/branch')
129
129
        tree = workingtree.WorkingTree.open('repo/branch')
130
130
        self.build_tree(['repo/branch/foo'])
131
131
        tree.add('foo')
136
136
 
137
137
    def test_shared_format_to_standalone(self, format=None):
138
138
        repo = self.make_repository('repo', shared=True, format=format)
139
 
        branch = bzrdir.BzrDir.create_branch_convenience('repo/tree')
 
139
        branch = controldir.ControlDir.create_branch_convenience('repo/tree')
140
140
        self.assertNotEqual(branch.bzrdir.root_transport.base,
141
141
            branch.repository.bzrdir.root_transport.base)
142
142
        tree = workingtree.WorkingTree.open('repo/tree')
175
175
        self.run_bzr('revert', working_dir='checkout')
176
176
        self.check_file_contents('checkout/file', 'foo\n')
177
177
 
178
 
    def test_lightweight_knit_checkout_to_tree(self, format=None):
 
178
    def test_lightweight_knit_checkout_to_tree(self):
179
179
        self.test_lightweight_format_checkout_to_tree('knit')
180
180
 
181
 
    def test_lightweight_pack092_checkout_to_tree(self, format=None):
 
181
    def test_lightweight_pack092_checkout_to_tree(self):
182
182
        self.test_lightweight_format_checkout_to_tree('pack-0.92')
183
183
 
184
 
    def test_lightweight_rich_root_pack_checkout_to_tree(self, format=None):
 
184
    def test_lightweight_rich_root_pack_checkout_to_tree(self):
185
185
        self.test_lightweight_format_checkout_to_tree('rich-root-pack')
186
186
 
 
187
    def test_branch_and_use_shared(self):
 
188
        self.run_script("""\
 
189
$ bzr init -q branch
 
190
$ echo foo > branch/foo
 
191
$ bzr add -q branch/foo
 
192
$ bzr commit -q -m msg branch
 
193
$ bzr init-repo -q .
 
194
$ bzr reconfigure --branch --use-shared branch
 
195
$ bzr info branch
 
196
Repository branch (format: ...)
 
197
Location:
 
198
  shared repository: .
 
199
  repository branch: branch
 
200
""")
 
201
 
 
202
    def test_use_shared_and_branch(self):
 
203
        self.run_script("""\
 
204
$ bzr init -q branch
 
205
$ echo foo > branch/foo
 
206
$ bzr add -q branch/foo
 
207
$ bzr commit -q -m msg branch
 
208
$ bzr init-repo -q .
 
209
$ bzr reconfigure --use-shared --branch branch
 
210
$ bzr info branch
 
211
Repository branch (format: ...)
 
212
Location:
 
213
  shared repository: .
 
214
  repository branch: branch
 
215
""")
 
216
 
187
217
 
188
218
class TestReconfigureStacking(tests.TestCaseWithTransport):
189
219
 
211
241
        branch_2 = tree_2.branch
212
242
        # now reconfigure to be stacked
213
243
        out, err = self.run_bzr('reconfigure --stacked-on b1 b2')
214
 
        self.assertContainsRe(out,
215
 
            '^.*/b2/ is now stacked on ../b1\n$')
 
244
        self.assertContainsRe(out, '^.*/b2/ is now stacked on ../b1\n$')
216
245
        self.assertEquals('', err)
217
246
        # can also give the absolute URL of the branch, and it gets stored 
218
247
        # as a relative path if possible
219
248
        out, err = self.run_bzr('reconfigure --stacked-on %s b2'
220
 
            % (self.get_url('b1'),))
221
 
        self.assertContainsRe(out,
222
 
            '^.*/b2/ is now stacked on ../b1\n$')
 
249
                                % (self.get_url('b1'),))
 
250
        self.assertContainsRe(out, '^.*/b2/ is now stacked on ../b1\n$')
223
251
        self.assertEquals('', err)
 
252
        # Refresh the branch as 'reconfigure' modified it
 
253
        branch_2 = branch_2.bzrdir.open_branch()
224
254
        # It should be given a relative URL to the destination, if possible,
225
255
        # because that's most likely to work across different transports
226
 
        self.assertEquals(branch_2.get_stacked_on_url(),
227
 
            '../b1')
 
256
        self.assertEquals('../b1', branch_2.get_stacked_on_url())
228
257
        # commit, and it should be stored into b2's repo
229
258
        self.build_tree_contents([('foo', 'new foo')])
230
259
        tree_2.commit('update foo')
233
262
        self.assertContainsRe(out,
234
263
            '^.*/b2/ is now not stacked\n$')
235
264
        self.assertEquals('', err)
236
 
        self.assertRaises(errors.NotStacked,
237
 
            branch_2.get_stacked_on_url)
 
265
        # Refresh the branch as 'reconfigure' modified it
 
266
        branch_2 = branch_2.bzrdir.open_branch()
 
267
        self.assertRaises(errors.NotStacked, branch_2.get_stacked_on_url)
238
268
 
239
269
    # XXX: Needs a test for reconfiguring stacking and shape at the same time;
240
270
    # no branch at location; stacked-on is not a branch; quiet mode.