/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

  • Committer: John Arbash Meinel
  • Date: 2006-07-18 18:57:54 UTC
  • mto: This revision was merged to the branch mainline in revision 1868.
  • Revision ID: john@arbash-meinel.com-20060718185754-4007745748e28db9
Commit timestamp restricted to 1ms precision.

The old code would restrict to 1s resolution if the timestamp was
supplied, while it preserved full resolution if the timestamp was
auto generated. Now both paths preserve only 1ms resolution.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_subsume.py
1
 
# Copyright (C) 2006 Canonical Ltd
2
 
#
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.
7
 
#
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.
12
 
#
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
 
 
17
 
from bzrlib import bzrdir, errors, repository, workingtree, tests
18
 
 
19
 
 
20
 
class TestWorkingTree(tests.TestCaseWithTransport):
21
 
 
22
 
    def make_branch_and_tree(self, relpath, format=None):
23
 
        if format is None:
24
 
            format = 'dirstate-with-subtree'
25
 
        return tests.TestCaseWithTransport.make_branch_and_tree(self, relpath,
26
 
                                                                format)
27
 
 
28
 
    def make_trees(self, format=None, same_root=False):
29
 
        self.build_tree(['tree/',
30
 
                         'tree/file',
31
 
                         'tree/subtree/',
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')
38
 
        if same_root is True:
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
43
 
 
44
 
    def test_old_knit1_failure(self):
45
 
        """Ensure that BadSubsumeSource is raised.
46
 
 
47
 
        SubsumeTargetNeedsUpgrade must not be raised, because upgrading the
48
 
        target won't help.
49
 
        """
50
 
        base_tree, sub_tree = self.make_trees(format='knit',
51
 
                                              same_root=True)
52
 
        self.assertRaises(errors.BadSubsumeSource, base_tree.subsume,
53
 
                          sub_tree)
54
 
 
55
 
    def test_knit1_failure(self):
56
 
        base_tree, sub_tree = self.make_trees(format='knit')
57
 
        self.assertRaises(errors.SubsumeTargetNeedsUpgrade, base_tree.subsume,
58
 
                          sub_tree)
59
 
 
60
 
    def test_subsume_tree(self):
61
 
        base_tree, sub_tree = self.make_trees()
62
 
        self.assertNotEqual(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)
66
 
        # it is correct.
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
73
 
        # it.
74
 
        self.failIfExists('tree/subtree/.bzr')
75
 
        file2 = open('tree/subtree/file2', 'rb')
76
 
        try:
77
 
            file2_contents = file2.read()
78
 
        finally:
79
 
            file2.close()
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)
97
 
 
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,
104
 
                          base_tree)
105
 
        self.assertRaises(errors.BadSubsumeSource, sub_tree.subsume,
106
 
                          base_tree)
107
 
        self.build_tree(['subtree2/'])
108
 
        sub_tree2 = self.make_branch_and_tree('subtree2')
109
 
        self.assertRaises(errors.BadSubsumeSource, sub_tree.subsume,
110
 
                          sub_tree2)
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,
114
 
                          sub_tree3)