← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevision.py

merge up with HEAD and with test-fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testrevision.py
132
132
class TestCommonAncestor(TestCaseInTempDir):
133
133
    """Test checking whether a revision is an ancestor of another revision"""
134
134
 
 
135
    def test_old_common_ancestor(self):
 
136
        """Pick a resonable merge base using the old functionality"""
 
137
        from bzrlib.revision import find_present_ancestors
 
138
        from bzrlib.revision import old_common_ancestor as common_ancestor
 
139
        from bzrlib.revision import MultipleRevisionSources
 
140
        br1, br2 = make_branches()
 
141
        revisions = br1.revision_history()
 
142
        revisions_2 = br2.revision_history()
 
143
        sources = MultipleRevisionSources(br1, br2)
 
144
 
 
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
 
 
158
        self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
 
159
                          revisions[0])
 
160
        self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
 
161
                          revisions[1])
 
162
        self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
 
163
                          revisions[1])
 
164
        self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
 
165
                          revisions[2])
 
166
        self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
 
167
                          revisions_2[4])
 
168
        self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
 
169
                          revisions_2[4])
 
170
        self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
 
171
                          revisions[4])
 
172
        self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
 
173
                          revisions_2[5])
 
174
 
135
175
    def test_common_ancestor(self):
136
 
        from bzrlib.revision import find_present_ancestors, common_ancestor
 
176
        """Pick a reasonable merge base"""
 
177
        from bzrlib.revision import find_present_ancestors
 
178
        from bzrlib.revision import common_ancestor
137
179
        from bzrlib.revision import MultipleRevisionSources
138
180
        br1, br2 = make_branches()
139
181
        revisions = br1.revision_history()
168
210
        self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
169
211
                          revisions[4])
170
212
        self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
171
 
                          revisions_2[5])
 
213
                          revisions[4])
 
214