1
# Copyright (C) 2007, 2009 Canonical Ltd
1
# Copyright (C) 2007-2012, 2016 Canonical Ltd
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
17
17
from bzrlib import (
23
from bzrlib.branchbuilder import BranchBuilder
26
class TestReconfigure(tests.TestCaseWithTransport):
23
from bzrlib.tests.script import TestCaseWithTransportAndScript
26
class TestReconfigure(TestCaseWithTransportAndScript):
28
28
def test_no_type(self):
29
29
branch = self.make_branch('branch')
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')
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'])
132
132
self.run_bzr('reconfigure --with-no-trees --force',
133
133
working_dir='repo/branch')
134
self.failUnlessExists('repo/branch/foo')
134
self.assertPathExists('repo/branch/foo')
135
135
tree = workingtree.WorkingTree.open('repo/branch')
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')
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')
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')
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')
187
def test_branch_and_use_shared(self):
190
$ echo foo > branch/foo
191
$ bzr add -q branch/foo
192
$ bzr commit -q -m msg branch
194
$ bzr reconfigure --branch --use-shared branch
196
Repository branch (format: ...)
199
repository branch: branch
202
def test_use_shared_and_branch(self):
205
$ echo foo > branch/foo
206
$ bzr add -q branch/foo
207
$ bzr commit -q -m msg branch
209
$ bzr reconfigure --use-shared --branch branch
211
Repository branch (format: ...)
214
repository branch: branch
188
218
class TestReconfigureStacking(tests.TestCaseWithTransport):
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$')
216
self.assertEquals('', err)
244
self.assertContainsRe(out, '^.*/b2/ is now stacked on ../b1\n$')
245
self.assertEqual('', 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$')
223
self.assertEquals('', err)
249
% (self.get_url('b1'),))
250
self.assertContainsRe(out, '^.*/b2/ is now stacked on ../b1\n$')
251
self.assertEqual('', 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(),
256
self.assertEqual('../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')
232
261
out, err = self.run_bzr('reconfigure --unstacked b2')
233
262
self.assertContainsRe(out,
234
263
'^.*/b2/ is now not stacked\n$')
235
self.assertEquals('', err)
236
self.assertRaises(errors.NotStacked,
237
branch_2.get_stacked_on_url)
264
self.assertEqual('', err)
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)
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.
added
removed
bzrlib/tests/blackbox/test_reconfigure.py
