13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
17
from bzrlib import (
18
18
branch as _mod_branch,
45
43
self.assertRaises(errors.NoWorkingTree, workingtree.WorkingTree.open,
48
def test_tree_with_pending_merge_to_branch(self):
49
tree = self.make_branch_and_tree('tree')
50
tree.commit('unchanged')
51
other_tree = tree.bzrdir.sprout('other').open_workingtree()
52
other_tree.commit('mergeable commit')
53
tree.merge_from_branch(other_tree.branch)
54
reconfiguration = reconfigure.Reconfigure.to_branch(tree.bzrdir)
55
self.assertRaises(errors.UncommittedChanges, reconfiguration.apply)
56
reconfiguration.apply(force=True)
57
self.assertRaises(errors.NoWorkingTree, workingtree.WorkingTree.open,
60
46
def test_branch_to_branch(self):
61
47
branch = self.make_branch('branch')
62
48
self.assertRaises(errors.AlreadyBranch,
72
58
checkout = branch.create_checkout('checkout')
73
59
reconfiguration = reconfigure.Reconfigure.to_branch(checkout.bzrdir)
74
60
reconfiguration.apply()
75
reconfigured = controldir.ControlDir.open('checkout').open_branch()
76
self.assertIs(None, reconfigured.get_bound_location())
61
self.assertIs(None, checkout.branch.get_bound_location())
78
63
def prepare_lightweight_checkout_to_branch(self):
79
64
branch = self.make_branch('branch')
148
133
self.assertRaises(errors.NoBindLocation,
149
134
reconfiguration._select_bind_location)
150
135
branch.set_parent('http://parent')
151
reconfiguration = reconfigure.Reconfigure(branch.bzrdir)
152
136
self.assertEqual('http://parent',
153
137
reconfiguration._select_bind_location())
154
138
branch.set_push_location('sftp://push')
155
reconfiguration = reconfigure.Reconfigure(branch.bzrdir)
156
139
self.assertEqual('sftp://push',
157
140
reconfiguration._select_bind_location())
160
branch.set_bound_location('bzr://foo/old-bound')
161
branch.set_bound_location(None)
164
reconfiguration = reconfigure.Reconfigure(branch.bzrdir)
141
branch.set_bound_location('bzr://foo/old-bound')
142
branch.set_bound_location(None)
165
143
self.assertEqual('bzr://foo/old-bound',
166
144
reconfiguration._select_bind_location())
167
145
branch.set_bound_location('bzr://foo/cur-bound')
168
reconfiguration = reconfigure.Reconfigure(branch.bzrdir)
169
146
self.assertEqual('bzr://foo/cur-bound',
170
147
reconfiguration._select_bind_location())
171
148
reconfiguration.new_bound_location = 'ftp://user-specified'
271
245
def test_branch_to_lightweight_checkout_failure(self):
272
246
parent, child, reconfiguration = \
273
247
self.prepare_branch_to_lightweight_checkout()
274
old_Repository_fetch = vf_repository.VersionedFileRepository.fetch
275
vf_repository.VersionedFileRepository.fetch = None
248
old_Repository_fetch = repository.Repository.fetch
249
repository.Repository.fetch = None
277
251
self.assertRaises(TypeError, reconfiguration.apply)
279
vf_repository.VersionedFileRepository.fetch = old_Repository_fetch
253
repository.Repository.fetch = old_Repository_fetch
280
254
child = _mod_branch.Branch.open('child')
281
255
self.assertContainsRe(child.base, 'child/$')
403
377
def test_unsynced_branch_to_lightweight_checkout_forced(self):
404
378
reconfiguration = self.make_unsynced_branch_reconfiguration()
405
379
reconfiguration.apply(force=True)
407
def make_repository_with_without_trees(self, with_trees):
408
repo = self.make_repository('repo', shared=True)
409
repo.set_make_working_trees(with_trees)
412
def test_make_with_trees(self):
413
repo = self.make_repository_with_without_trees(False)
414
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
416
reconfiguration.apply()
417
self.assertIs(True, repo.make_working_trees())
419
def test_make_without_trees(self):
420
repo = self.make_repository_with_without_trees(True)
421
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
423
reconfiguration.apply()
424
self.assertIs(False, repo.make_working_trees())
426
def test_make_with_trees_already_with_trees(self):
427
repo = self.make_repository_with_without_trees(True)
428
e = self.assertRaises(errors.AlreadyWithTrees,
429
reconfigure.Reconfigure.set_repository_trees, repo.bzrdir, True)
430
self.assertContainsRe(str(e),
431
r"Shared repository '.*' already creates working trees.")
433
def test_make_without_trees_already_no_trees(self):
434
repo = self.make_repository_with_without_trees(False)
435
e = self.assertRaises(errors.AlreadyWithNoTrees,
436
reconfigure.Reconfigure.set_repository_trees, repo.bzrdir, False)
437
self.assertContainsRe(str(e),
438
r"Shared repository '.*' already doesn't create working trees.")
440
def test_repository_tree_reconfiguration_not_supported(self):
441
tree = self.make_branch_and_tree('tree')
442
e = self.assertRaises(errors.ReconfigurationNotSupported,
443
reconfigure.Reconfigure.set_repository_trees, tree.bzrdir, None)
444
self.assertContainsRe(str(e),
445
r"Requested reconfiguration of '.*' is not supported.")
447
def test_lightweight_checkout_to_tree_preserves_reference_locations(self):
448
format = controldir.format_registry.make_bzrdir('1.9')
449
format.set_branch_format(_mod_branch.BzrBranchFormat8())
450
tree = self.make_branch_and_tree('tree', format=format)
451
tree.branch.set_reference_info('file_id', 'path', '../location')
452
checkout = tree.branch.create_checkout('checkout', lightweight=True)
453
reconfiguration = reconfigure.Reconfigure.to_tree(checkout.bzrdir)
454
reconfiguration.apply()
455
checkout_branch = checkout.bzrdir.open_branch()
456
self.assertEqual(('path', '../location'),
457
checkout_branch.get_reference_info('file_id'))