← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevision.py

  • Committer: Lalo Martins
  • Date: 2005-09-14 05:22:13 UTC
  • mfrom: (1185.1.10)
  • mto: (1185.1.22)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: lalo@exoweb.net-20050914052213-2aa5c1005959abdf
merging from Robert's integration branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testrevision.py
128
128
        self.assertRaises(NoSuchRevision, self.intervene, 'b@u-0-10', 
129
129
                          'c@u-0-6', self.br2.revision_history())
130
130
 
 
131
class TestIntermediateRevisions(TestCaseInTempDir):
 
132
 
 
133
    def setUp(self):
 
134
        from bzrlib.commit import commit
 
135
        TestCaseInTempDir.setUp(self)
 
136
        self.br1, self.br2 = make_branches()
 
137
        commit(self.br2, "Commit eleven", rev_id="b@u-0-7")
 
138
        commit(self.br2, "Commit twelve", rev_id="b@u-0-8")
 
139
        commit(self.br2, "Commit thirtteen", rev_id="b@u-0-9")
 
140
        self.br1.add_pending_merge(self.br2.revision_history()[6])
 
141
        commit(self.br1, "Commit fourtten", rev_id="a@u-0-6")
 
142
        self.br2.add_pending_merge(self.br1.revision_history()[6])
 
143
        commit(self.br2, "Commit fifteen", rev_id="b@u-0-10")
 
144
 
 
145
        from bzrlib.revision import MultipleRevisionSources
 
146
        self.sources = MultipleRevisionSources(self.br1, self.br2)
 
147
 
 
148
    def intervene(self, ancestor, revision, revision_history=None):
 
149
        from bzrlib.revision import get_intervening_revisions
 
150
        return get_intervening_revisions(ancestor,revision, self.sources, 
 
151
                                         revision_history)
 
152
 
 
153
    def test_intervene(self):
 
154
        """Find intermediate revisions, without requiring history"""
 
155
        from bzrlib.errors import NotAncestor, NoSuchRevision
 
156
        assert len(self.intervene('a@u-0-0', 'a@u-0-0')) == 0
 
157
        self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-1'), ['a@u-0-1'])
 
158
        self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-2'), 
 
159
                         ['a@u-0-1', 'a@u-0-2'])
 
160
        self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-3'), 
 
161
                         ['a@u-0-1', 'a@u-0-2', 'b@u-0-3'])
 
162
        self.assertEqual(self.intervene('b@u-0-3', 'a@u-0-3'), 
 
163
                         ['b@u-0-4', 'a@u-0-3'])
 
164
        self.assertEqual(self.intervene('a@u-0-2', 'a@u-0-3', 
 
165
                                        self.br1.revision_history()), 
 
166
                         ['a@u-0-3'])
 
167
        self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-5', 
 
168
                                        self.br1.revision_history()), 
 
169
                         ['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4', 
 
170
                          'a@u-0-5'])
 
171
        self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-6', 
 
172
                         self.br1.revision_history()), 
 
173
                         ['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4', 
 
174
                          'b@u-0-6'])
 
175
        self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-5'), 
 
176
                         ['a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4', 
 
177
                          'b@u-0-5'])
 
178
        self.assertEqual(self.intervene('b@u-0-3', 'b@u-0-6', 
 
179
                         self.br2.revision_history()), 
 
180
                         ['b@u-0-4', 'b@u-0-5', 'b@u-0-6'])
 
181
        self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10'), 
 
182
                         ['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
 
183
        self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10', 
 
184
                                        self.br2.revision_history()), 
 
185
                         ['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
 
186
        self.assertRaises(NotAncestor, self.intervene, 'b@u-0-10', 'b@u-0-6', 
 
187
                          self.br2.revision_history())
 
188
        self.assertRaises(NoSuchRevision, self.intervene, 'c@u-0-10', 
 
189
                          'b@u-0-6', self.br2.revision_history())
 
190
        self.assertRaises(NoSuchRevision, self.intervene, 'b@u-0-10', 
 
191
                          'c@u-0-6', self.br2.revision_history())
 
192
 
131
193
 
132
194
class TestCommonAncestor(TestCaseInTempDir):
133
195
    """Test checking whether a revision is an ancestor of another revision"""
134
196
 
 
197
    def test_old_common_ancestor(self):
 
198
        """Pick a resonable merge base using the old functionality"""
 
199
        from bzrlib.revision import find_present_ancestors
 
200
        from bzrlib.revision import old_common_ancestor as common_ancestor
 
201
        from bzrlib.revision import MultipleRevisionSources
 
202
        br1, br2 = make_branches()
 
203
        revisions = br1.revision_history()
 
204
        revisions_2 = br2.revision_history()
 
205
        sources = MultipleRevisionSources(br1, br2)
 
206
 
 
207
        expected_ancestors_list = {revisions[3]:(0, 0), 
 
208
                                   revisions[2]:(1, 1),
 
209
                                   revisions_2[4]:(2, 1), 
 
210
                                   revisions[1]:(3, 2),
 
211
                                   revisions_2[3]:(4, 2),
 
212
                                   revisions[0]:(5, 3) }
 
213
        ancestors_list = find_present_ancestors(revisions[3], sources)
 
214
        assert len(expected_ancestors_list) == len(ancestors_list)
 
215
        for key, value in expected_ancestors_list.iteritems():
 
216
            self.assertEqual(ancestors_list[key], value, 
 
217
                              "key %r, %r != %r" % (key, ancestors_list[key],
 
218
                                                    value))
 
219
 
 
220
        self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
 
221
                          revisions[0])
 
222
        self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
 
223
                          revisions[1])
 
224
        self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
 
225
                          revisions[1])
 
226
        self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
 
227
                          revisions[2])
 
228
        self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
 
229
                          revisions_2[4])
 
230
        self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
 
231
                          revisions_2[4])
 
232
        self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
 
233
                          revisions[4])
 
234
        self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
 
235
                          revisions_2[5])
 
236
 
135
237
    def test_common_ancestor(self):
136
 
        from bzrlib.revision import find_present_ancestors, common_ancestor
 
238
        """Pick a reasonable merge base"""
 
239
        from bzrlib.revision import find_present_ancestors
 
240
        from bzrlib.revision import common_ancestor
137
241
        from bzrlib.revision import MultipleRevisionSources
138
242
        br1, br2 = make_branches()
139
243
        revisions = br1.revision_history()
168
272
        self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
169
273
                          revisions[4])
170
274
        self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
171
 
                          revisions_2[5])
 
275
                          revisions[4])
 
276