/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_subsume.py

Merge from by-reference-trees

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_subsume.py
12
12
#
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
16
16
 
17
17
from bzrlib import bzrdir, errors, repository, workingtree, tests
18
18
 
21
21
 
22
22
    def make_branch_and_tree(self, relpath, format=None):
23
23
        if format is None:
24
 
            format = 'dirstate-with-subtree'
25
 
        return tests.TestCaseWithTransport.make_branch_and_tree(self, relpath,
 
24
            format = 'experimental-knit3'
 
25
        return tests.TestCaseWithTransport.make_branch_and_tree(self, relpath, 
26
26
                                                                format)
27
27
 
28
28
    def make_trees(self, format=None, same_root=False):
29
 
        self.build_tree(['tree/',
 
29
        self.build_tree(['tree/', 
30
30
                         'tree/file',
31
31
                         'tree/subtree/',
32
32
                         'tree/subtree/file2'])
33
33
        base_tree = self.make_branch_and_tree('tree', format=format)
34
34
        base_tree.add('file', 'file-id')
35
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')
 
36
        sub_tree = self.make_branch_and_tree('tree/subtree', 
 
37
                                             format='experimental-knit3')
38
38
        if same_root is True:
39
39
            sub_tree.set_root_id(base_tree.get_root_id())
40
40
        sub_tree.add('file2', 'file2-id')
49
49
        """
50
50
        base_tree, sub_tree = self.make_trees(format='knit',
51
51
                                              same_root=True)
52
 
        self.assertRaises(errors.BadSubsumeSource, base_tree.subsume,
 
52
        self.assertRaises(errors.BadSubsumeSource, base_tree.subsume, 
53
53
                          sub_tree)
54
54
 
55
55
    def test_knit1_failure(self):
56
56
        base_tree, sub_tree = self.make_trees(format='knit')
57
 
        self.assertRaises(errors.SubsumeTargetNeedsUpgrade, base_tree.subsume,
 
57
        self.assertRaises(errors.SubsumeTargetNeedsUpgrade, base_tree.subsume, 
58
58
                          sub_tree)
59
59
 
60
60
    def test_subsume_tree(self):
61
61
        base_tree, sub_tree = self.make_trees()
62
 
        self.assertNotEqual(base_tree.get_root_id(), sub_tree.get_root_id())
 
62
        assert base_tree.get_root_id() != sub_tree.get_root_id()
63
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)
66
 
        # it is correct.
67
 
        self.failUnlessExists('tree/subtree/.bzr')
68
64
        base_tree.subsume(sub_tree)
69
65
        self.assertEqual(['tree-1', 'subtree-1'], base_tree.get_parent_ids())
70
66
        self.assertEqual(sub_root_id, base_tree.path2id('subtree'))
71
67
        self.assertEqual('file2-id', base_tree.path2id('subtree/file2'))
72
 
        # subsuming the tree removes the control directory, so you can't open
73
 
        # it.
74
 
        self.failIfExists('tree/subtree/.bzr')
 
68
        sub_bzrdir = bzrdir.BzrDir.open('tree/subtree')
 
69
        self.assertRaises(errors.NoWorkingTree, sub_bzrdir.open_workingtree)
 
70
        sub_bzrdir.open_branch()
75
71
        file2 = open('tree/subtree/file2', 'rb')
76
72
        try:
77
73
            file2_contents = file2.read()
81
77
        base_tree.commit('combined', rev_id='combined-1')
82
78
        self.assertEqual('file2-id', base_tree.path2id('subtree/file2'))
83
79
        self.assertEqual('subtree/file2', base_tree.id2path('file2-id'))
84
 
        self.assertEqualDiff(file2_contents,
 
80
        self.assertEqualDiff(file2_contents, 
85
81
                             base_tree.get_file_text('file2-id'))
86
82
        basis_tree = base_tree.basis_tree()
87
 
        basis_tree.lock_read()
88
 
        self.addCleanup(basis_tree.unlock)
89
 
        self.assertEqualDiff(file2_contents,
 
83
        self.assertEqualDiff(file2_contents, 
90
84
                             base_tree.get_file_text('file2-id'))
91
 
        self.assertEqualDiff(file2_contents,
 
85
        self.assertEqualDiff(file2_contents, 
92
86
                             basis_tree.get_file_text('file2-id'))
93
 
        self.assertEqual('subtree-1',
 
87
        self.assertEqual('subtree-1', 
94
88
                         basis_tree.inventory['file2-id'].revision)
95
 
        self.assertEqual('combined-1',
 
89
        self.assertEqual('combined-1', 
96
90
                         basis_tree.inventory[sub_root_id].revision)
97
91
 
98
92
    def test_subsume_failure(self):
100
94
        if base_tree.get_root_id() == sub_tree.get_root_id():
101
95
            raise tests.TestSkipped('This test requires unique roots')
102
96
        sub_root_id = sub_tree.get_root_id()
103
 
        self.assertRaises(errors.BadSubsumeSource, base_tree.subsume,
 
97
        self.assertRaises(errors.BadSubsumeSource, base_tree.subsume, 
104
98
                          base_tree)
105
 
        self.assertRaises(errors.BadSubsumeSource, sub_tree.subsume,
 
99
        self.assertRaises(errors.BadSubsumeSource, sub_tree.subsume, 
106
100
                          base_tree)
107
101
        self.build_tree(['subtree2/'])
108
102
        sub_tree2 = self.make_branch_and_tree('subtree2')
109
 
        self.assertRaises(errors.BadSubsumeSource, sub_tree.subsume,
 
103
        self.assertRaises(errors.BadSubsumeSource, sub_tree.subsume, 
110
104
                          sub_tree2)
111
105
        self.build_tree(['tree/subtree/subtree3/'])
112
106
        sub_tree3 = self.make_branch_and_tree('tree/subtree/subtree3')