1
# Copyright (C) 2006 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
from bzrlib import bzrdir, errors, repository, workingtree, tests
20
class TestWorkingTree(tests.TestCaseWithTransport):
22
def make_branch_and_tree(self, relpath, format=None):
24
format = 'dirstate-with-subtree'
25
return tests.TestCaseWithTransport.make_branch_and_tree(self, relpath,
28
def make_trees(self, format=None, same_root=False):
29
self.build_tree(['tree/',
32
'tree/subtree/file2'])
33
base_tree = self.make_branch_and_tree('tree', format=format)
34
base_tree.add('file', 'file-id')
35
base_tree.commit('first commit', rev_id='tree-1')
36
sub_tree = self.make_branch_and_tree('tree/subtree',
37
format='dirstate-with-subtree')
39
sub_tree.set_root_id(base_tree.get_root_id())
40
sub_tree.add('file2', 'file2-id')
41
sub_tree.commit('first commit', rev_id='subtree-1')
42
return base_tree, sub_tree
44
def test_old_knit1_failure(self):
45
"""Ensure that BadSubsumeSource is raised.
47
SubsumeTargetNeedsUpgrade must not be raised, because upgrading the
50
base_tree, sub_tree = self.make_trees(format='knit',
52
self.assertRaises(errors.BadSubsumeSource, base_tree.subsume,
55
def test_knit1_failure(self):
56
base_tree, sub_tree = self.make_trees(format='knit')
57
self.assertRaises(errors.SubsumeTargetNeedsUpgrade, base_tree.subsume,
60
def test_subsume_tree(self):
61
base_tree, sub_tree = self.make_trees()
62
assert base_tree.get_root_id() != sub_tree.get_root_id()
63
sub_root_id = sub_tree.get_root_id()
64
# this test checks the subdir is removed, so it needs to know the
65
# control directory; that changes rarely so just hardcode (and check)
67
self.failUnlessExists('tree/subtree/.bzr')
68
base_tree.subsume(sub_tree)
69
self.assertEqual(['tree-1', 'subtree-1'], base_tree.get_parent_ids())
70
self.assertEqual(sub_root_id, base_tree.path2id('subtree'))
71
self.assertEqual('file2-id', base_tree.path2id('subtree/file2'))
72
# subsuming the tree removes the control directory, so you can't open
74
self.failIfExists('tree/subtree/.bzr')
75
file2 = open('tree/subtree/file2', 'rb')
77
file2_contents = file2.read()
80
base_tree = workingtree.WorkingTree.open('tree')
81
base_tree.commit('combined', rev_id='combined-1')
82
self.assertEqual('file2-id', base_tree.path2id('subtree/file2'))
83
self.assertEqual('subtree/file2', base_tree.id2path('file2-id'))
84
self.assertEqualDiff(file2_contents,
85
base_tree.get_file_text('file2-id'))
86
basis_tree = base_tree.basis_tree()
87
basis_tree.lock_read()
88
self.addCleanup(basis_tree.unlock)
89
self.assertEqualDiff(file2_contents,
90
base_tree.get_file_text('file2-id'))
91
self.assertEqualDiff(file2_contents,
92
basis_tree.get_file_text('file2-id'))
93
self.assertEqual('subtree-1',
94
basis_tree.inventory['file2-id'].revision)
95
self.assertEqual('combined-1',
96
basis_tree.inventory[sub_root_id].revision)
98
def test_subsume_failure(self):
99
base_tree, sub_tree = self.make_trees()
100
if base_tree.get_root_id() == sub_tree.get_root_id():
101
raise tests.TestSkipped('This test requires unique roots')
102
sub_root_id = sub_tree.get_root_id()
103
self.assertRaises(errors.BadSubsumeSource, base_tree.subsume,
105
self.assertRaises(errors.BadSubsumeSource, sub_tree.subsume,
107
self.build_tree(['subtree2/'])
108
sub_tree2 = self.make_branch_and_tree('subtree2')
109
self.assertRaises(errors.BadSubsumeSource, sub_tree.subsume,
111
self.build_tree(['tree/subtree/subtree3/'])
112
sub_tree3 = self.make_branch_and_tree('tree/subtree/subtree3')
113
self.assertRaises(errors.BadSubsumeSource, base_tree.subsume,
added
removed
bzrlib/tests/test_subsume.py
