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