/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/selftest/testrevision.py

  • Committer: Robert Collins
  • Date: 2005-09-29 02:55:34 UTC
  • mfrom: (1185.1.47)
  • mto: This revision was merged to the branch mainline in revision 1397.
  • Revision ID: robertc@robertcollins.net-20050929025534-1782933743abbfd5
update with integration

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testrevision.py
 
1
# (C) 2005 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
from bzrlib.selftest import TestCaseInTempDir
 
18
from bzrlib.revision import is_ancestor, MultipleRevisionSources
 
19
from bzrlib.revision import combined_graph
 
20
 
 
21
def make_branches():
 
22
    from bzrlib.branch import Branch
 
23
    from bzrlib.commit import commit
 
24
    import os
 
25
    os.mkdir("branch1")
 
26
    br1 = Branch.initialize("branch1")
 
27
    
 
28
    commit(br1, "Commit one", rev_id="a@u-0-0")
 
29
    commit(br1, "Commit two", rev_id="a@u-0-1")
 
30
    commit(br1, "Commit three", rev_id="a@u-0-2")
 
31
 
 
32
    os.mkdir("branch2")
 
33
    br2 = Branch.initialize("branch2")
 
34
    br2.update_revisions(br1)
 
35
    commit(br2, "Commit four", rev_id="b@u-0-3")
 
36
    commit(br2, "Commit five", rev_id="b@u-0-4")
 
37
    revisions_2 = br2.revision_history()
 
38
    br1.add_pending_merge(revisions_2[4])
 
39
    commit(br1, "Commit six", rev_id="a@u-0-3")
 
40
    commit(br1, "Commit seven", rev_id="a@u-0-4")
 
41
    commit(br2, "Commit eight", rev_id="b@u-0-5")
 
42
    br1.add_pending_merge(br2.revision_history()[5])
 
43
    commit(br1, "Commit nine", rev_id="a@u-0-5")
 
44
    br2.add_pending_merge(br1.revision_history()[4])
 
45
    commit(br2, "Commit ten", rev_id="b@u-0-6")
 
46
    return br1, br2
 
47
 
 
48
 
 
49
class TestIsAncestor(TestCaseInTempDir):
 
50
    def test_is_ancestor(self):
 
51
        """Test checking whether a revision is an ancestor of another revision"""
 
52
        from bzrlib.errors import NoSuchRevision
 
53
        br1, br2 = make_branches()
 
54
        revisions = br1.revision_history()
 
55
        revisions_2 = br2.revision_history()
 
56
        sources = MultipleRevisionSources(br1, br2)
 
57
 
 
58
        assert is_ancestor(revisions[0], revisions[0], sources)
 
59
        assert is_ancestor(revisions[1], revisions[0], sources)
 
60
        assert not is_ancestor(revisions[0], revisions[1], sources)
 
61
        assert is_ancestor(revisions_2[3], revisions[0], sources)
 
62
        self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
 
63
                          revisions[0], br1)        
 
64
        assert is_ancestor(revisions[3], revisions_2[4], sources)
 
65
        assert is_ancestor(revisions[3], revisions_2[4], br1)
 
66
        assert is_ancestor(revisions[3], revisions_2[3], sources)
 
67
        assert not is_ancestor(revisions[3], revisions_2[3], br1)
 
68
 
 
69
 
 
70
class TestIntermediateRevisions(TestCaseInTempDir):
 
71
 
 
72
    def setUp(self):
 
73
        from bzrlib.commit import commit
 
74
        TestCaseInTempDir.setUp(self)
 
75
        self.br1, self.br2 = make_branches()
 
76
        commit(self.br2, "Commit eleven", rev_id="b@u-0-7")
 
77
        commit(self.br2, "Commit twelve", rev_id="b@u-0-8")
 
78
        commit(self.br2, "Commit thirtteen", rev_id="b@u-0-9")
 
79
        self.br1.add_pending_merge(self.br2.revision_history()[6])
 
80
        commit(self.br1, "Commit fourtten", rev_id="a@u-0-6")
 
81
        self.br2.add_pending_merge(self.br1.revision_history()[6])
 
82
        commit(self.br2, "Commit fifteen", rev_id="b@u-0-10")
 
83
 
 
84
        from bzrlib.revision import MultipleRevisionSources
 
85
        self.sources = MultipleRevisionSources(self.br1, self.br2)
 
86
 
 
87
    def intervene(self, ancestor, revision, revision_history=None):
 
88
        from bzrlib.revision import get_intervening_revisions
 
89
        return get_intervening_revisions(ancestor,revision, self.sources, 
 
90
                                         revision_history)
 
91
 
 
92
    def test_intervene(self):
 
93
        """Find intermediate revisions, without requiring history"""
 
94
        from bzrlib.errors import NotAncestor, NoSuchRevision
 
95
        assert len(self.intervene('a@u-0-0', 'a@u-0-0')) == 0
 
96
        self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-1'), ['a@u-0-1'])
 
97
        self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-2'), 
 
98
                         ['a@u-0-1', 'a@u-0-2'])
 
99
        self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-3'), 
 
100
                         ['a@u-0-1', 'a@u-0-2', 'b@u-0-3'])
 
101
        self.assertEqual(self.intervene('b@u-0-3', 'a@u-0-3'), 
 
102
                         ['b@u-0-4', 'a@u-0-3'])
 
103
        self.assertEqual(self.intervene('a@u-0-2', 'a@u-0-3', 
 
104
                                        self.br1.revision_history()), 
 
105
                         ['a@u-0-3'])
 
106
        self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-5', 
 
107
                                        self.br1.revision_history()), 
 
108
                         ['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4', 
 
109
                          'a@u-0-5'])
 
110
        self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-6', 
 
111
                         self.br1.revision_history()), 
 
112
                         ['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4', 
 
113
                          'b@u-0-6'])
 
114
        self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-5'), 
 
115
                         ['a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4', 
 
116
                          'b@u-0-5'])
 
117
        self.assertEqual(self.intervene('b@u-0-3', 'b@u-0-6', 
 
118
                         self.br2.revision_history()), 
 
119
                         ['b@u-0-4', 'b@u-0-5', 'b@u-0-6'])
 
120
        self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10'), 
 
121
                         ['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
 
122
        self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10', 
 
123
                                        self.br2.revision_history()), 
 
124
                         ['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
 
125
        self.assertRaises(NotAncestor, self.intervene, 'b@u-0-10', 'b@u-0-6', 
 
126
                          self.br2.revision_history())
 
127
        self.assertRaises(NoSuchRevision, self.intervene, 'c@u-0-10', 
 
128
                          'b@u-0-6', self.br2.revision_history())
 
129
        self.assertRaises(NoSuchRevision, self.intervene, 'b@u-0-10', 
 
130
                          'c@u-0-6', self.br2.revision_history())
 
131
 
 
132
 
 
133
class TestCommonAncestor(TestCaseInTempDir):
 
134
    """Test checking whether a revision is an ancestor of another revision"""
 
135
 
 
136
    def test_old_common_ancestor(self):
 
137
        """Pick a resonable merge base using the old functionality"""
 
138
        from bzrlib.revision import find_present_ancestors
 
139
        from bzrlib.revision import old_common_ancestor as common_ancestor
 
140
        from bzrlib.revision import MultipleRevisionSources
 
141
        br1, br2 = make_branches()
 
142
        revisions = br1.revision_history()
 
143
        revisions_2 = br2.revision_history()
 
144
        sources = MultipleRevisionSources(br1, br2)
 
145
        expected_ancestors_list = {revisions[3]:(0, 0), 
 
146
                                   revisions[2]:(1, 1),
 
147
                                   revisions_2[4]:(2, 1), 
 
148
                                   revisions[1]:(3, 2),
 
149
                                   revisions_2[3]:(4, 2),
 
150
                                   revisions[0]:(5, 3) }
 
151
        ancestors_list = find_present_ancestors(revisions[3], sources)
 
152
        assert len(expected_ancestors_list) == len(ancestors_list)
 
153
        for key, value in expected_ancestors_list.iteritems():
 
154
            self.assertEqual(ancestors_list[key], value, 
 
155
                              "key %r, %r != %r" % (key, ancestors_list[key],
 
156
                                                    value))
 
157
        self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
 
158
                          revisions[0])
 
159
        self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
 
160
                          revisions[1])
 
161
        self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
 
162
                          revisions[1])
 
163
        self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
 
164
                          revisions[2])
 
165
        self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
 
166
                          revisions_2[4])
 
167
        self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
 
168
                          revisions_2[4])
 
169
        self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
 
170
                          revisions[4])
 
171
        self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
 
172
                          revisions_2[5])
 
173
 
 
174
    def test_common_ancestor(self):
 
175
        """Pick a reasonable merge base"""
 
176
        from bzrlib.revision import find_present_ancestors
 
177
        from bzrlib.revision import common_ancestor
 
178
        from bzrlib.revision import MultipleRevisionSources
 
179
        br1, br2 = make_branches()
 
180
        revisions = br1.revision_history()
 
181
        revisions_2 = br2.revision_history()
 
182
        sources = MultipleRevisionSources(br1, br2)
 
183
 
 
184
        expected_ancestors_list = {revisions[3]:(0, 0), 
 
185
                                   revisions[2]:(1, 1),
 
186
                                   revisions_2[4]:(2, 1), 
 
187
                                   revisions[1]:(3, 2),
 
188
                                   revisions_2[3]:(4, 2),
 
189
                                   revisions[0]:(5, 3) }
 
190
        ancestors_list = find_present_ancestors(revisions[3], sources)
 
191
        assert len(expected_ancestors_list) == len(ancestors_list)
 
192
        for key, value in expected_ancestors_list.iteritems():
 
193
            self.assertEqual(ancestors_list[key], value, 
 
194
                              "key %r, %r != %r" % (key, ancestors_list[key],
 
195
                                                    value))
 
196
 
 
197
        self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
 
198
                          revisions[0])
 
199
        self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
 
200
                          revisions[1])
 
201
        self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
 
202
                          revisions[1])
 
203
        self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
 
204
                          revisions[2])
 
205
        self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
 
206
                          revisions_2[4])
 
207
        self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
 
208
                          revisions_2[4])
 
209
        self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
 
210
                          revisions[4])
 
211
        self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
 
212
                          revisions[4])
 
213
 
 
214
    def test_combined(self):
 
215
        """combined_graph
 
216
        Ensure it's not order-sensitive
 
217
        """
 
218
        br1, br2 = make_branches()
 
219
        source = MultipleRevisionSources(br1, br2)
 
220
        combined_1 = combined_graph(br1.last_patch(), br2.last_patch(), source)
 
221
        combined_2 = combined_graph(br2.last_patch(), br1.last_patch(), source)
 
222
        assert combined_1[1] == combined_2[1]
 
223
        assert combined_1[2] == combined_2[2]
 
224
        assert combined_1[3] == combined_2[3]
 
225
        assert combined_1 == combined_2