← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevision.py

  • Committer: aaron.bentley at utoronto
  • Date: 2005-08-21 04:15:04 UTC
  • mto: (1092.1.41) (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1110.
  • Revision ID: aaron.bentley@utoronto.ca-20050821041504-866f53c120065af3
Added revision-based common-ancestor checking

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testrevision.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
from bzrlib.selftest import TestCaseInTempDir
 
17
from bzrlib.selftest import InTempDir
18
18
 
19
19
 
20
20
def make_branches():
21
21
    from bzrlib.branch import Branch
22
22
    from bzrlib.commit import commit
 
23
    from bzrlib.revision import validate_revision_id
23
24
    import os
24
25
    os.mkdir("branch1")
25
26
    br1 = Branch("branch1", init=True)
45
46
    return br1, br2
46
47
 
47
48
 
48
 
class TestIsAncestor(TestCaseInTempDir):
49
 
    def test_is_ancestor(self):
50
 
        """Test checking whether a revision is an ancestor of another revision"""
 
49
class TestIsAncestor(InTempDir):
 
50
    """Test checking whether a revision is an ancestor of another revision"""
 
51
    def runTest(self):
51
52
        from bzrlib.revision import is_ancestor, MultipleRevisionSources
52
53
        from bzrlib.errors import NoSuchRevision
53
54
        br1, br2 = make_branches()
66
67
        assert is_ancestor(revisions[3], revisions_2[3], sources)
67
68
        assert not is_ancestor(revisions[3], revisions_2[3], br1)
68
69
 
69
 
class TestIntermediateRevisions(TestCaseInTempDir):
70
 
 
71
 
    def setUp(self):
72
 
        from bzrlib.commit import commit
73
 
        TestCaseInTempDir.setUp(self)
74
 
        self.br1, self.br2 = make_branches()
75
 
        commit(self.br2, "Commit eleven", rev_id="b@u-0-7")
76
 
        commit(self.br2, "Commit twelve", rev_id="b@u-0-8")
77
 
        commit(self.br2, "Commit thirtteen", rev_id="b@u-0-9")
78
 
        self.br1.add_pending_merge(self.br2.revision_history()[6])
79
 
        commit(self.br1, "Commit fourtten", rev_id="a@u-0-6")
80
 
        self.br2.add_pending_merge(self.br1.revision_history()[6])
81
 
        commit(self.br2, "Commit fifteen", rev_id="b@u-0-10")
82
 
 
83
 
        from bzrlib.revision import MultipleRevisionSources
84
 
        self.sources = MultipleRevisionSources(self.br1, self.br2)
85
 
 
86
 
    def intervene(self, ancestor, revision, revision_history=None):
87
 
        from bzrlib.revision import get_intervening_revisions
88
 
        return get_intervening_revisions(ancestor,revision, self.sources, 
89
 
                                         revision_history)
90
 
 
91
 
    def test_intervene(self):
92
 
        """Find intermediate revisions, without requiring history"""
93
 
        from bzrlib.errors import NotAncestor, NoSuchRevision
94
 
        assert len(self.intervene('a@u-0-0', 'a@u-0-0')) == 0
95
 
        self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-1'), ['a@u-0-1'])
96
 
        self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-2'), 
97
 
                         ['a@u-0-1', 'a@u-0-2'])
98
 
        self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-3'), 
99
 
                         ['a@u-0-1', 'a@u-0-2', 'b@u-0-3'])
100
 
        self.assertEqual(self.intervene('b@u-0-3', 'a@u-0-3'), 
101
 
                         ['b@u-0-4', 'a@u-0-3'])
102
 
        self.assertEqual(self.intervene('a@u-0-2', 'a@u-0-3', 
103
 
                                        self.br1.revision_history()), 
104
 
                         ['a@u-0-3'])
105
 
        self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-5', 
106
 
                                        self.br1.revision_history()), 
107
 
                         ['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4', 
108
 
                          'a@u-0-5'])
109
 
        self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-6', 
110
 
                         self.br1.revision_history()), 
111
 
                         ['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4', 
112
 
                          'b@u-0-6'])
113
 
        self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-5'), 
114
 
                         ['a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4', 
115
 
                          'b@u-0-5'])
116
 
        self.assertEqual(self.intervene('b@u-0-3', 'b@u-0-6', 
117
 
                         self.br2.revision_history()), 
118
 
                         ['b@u-0-4', 'b@u-0-5', 'b@u-0-6'])
119
 
        self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10'), 
120
 
                         ['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
121
 
        self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10', 
122
 
                                        self.br2.revision_history()), 
123
 
                         ['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
124
 
        self.assertRaises(NotAncestor, self.intervene, 'b@u-0-10', 'b@u-0-6', 
125
 
                          self.br2.revision_history())
126
 
        self.assertRaises(NoSuchRevision, self.intervene, 'c@u-0-10', 
127
 
                          'b@u-0-6', self.br2.revision_history())
128
 
        self.assertRaises(NoSuchRevision, self.intervene, 'b@u-0-10', 
129
 
                          'c@u-0-6', self.br2.revision_history())
130
 
 
131
 
 
132
 
class TestCommonAncestor(TestCaseInTempDir):
 
70
 
 
71
class TestCommonAncestor(InTempDir):
133
72
    """Test checking whether a revision is an ancestor of another revision"""
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
 
73
    def runTest(self):
 
74
        from bzrlib.revision import find_present_ancestors, common_ancestor
139
75
        from bzrlib.revision import MultipleRevisionSources
140
76
        br1, br2 = make_branches()
141
77
        revisions = br1.revision_history()
172
108
        self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
173
109
                          revisions_2[5])
174
110
 
175
 
    def test_common_ancestor(self):
176
 
        """Pick a reasonable merge base"""
177
 
        from bzrlib.revision import find_present_ancestors
178
 
        from bzrlib.revision import common_ancestor
179
 
        from bzrlib.revision import MultipleRevisionSources
180
 
        br1, br2 = make_branches()
181
 
        revisions = br1.revision_history()
182
 
        revisions_2 = br2.revision_history()
183
 
        sources = MultipleRevisionSources(br1, br2)
184
 
 
185
 
        expected_ancestors_list = {revisions[3]:(0, 0), 
186
 
                                   revisions[2]:(1, 1),
187
 
                                   revisions_2[4]:(2, 1), 
188
 
                                   revisions[1]:(3, 2),
189
 
                                   revisions_2[3]:(4, 2),
190
 
                                   revisions[0]:(5, 3) }
191
 
        ancestors_list = find_present_ancestors(revisions[3], sources)
192
 
        assert len(expected_ancestors_list) == len(ancestors_list)
193
 
        for key, value in expected_ancestors_list.iteritems():
194
 
            self.assertEqual(ancestors_list[key], value, 
195
 
                              "key %r, %r != %r" % (key, ancestors_list[key],
196
 
                                                    value))
197
 
 
198
 
        self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
199
 
                          revisions[0])
200
 
        self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
201
 
                          revisions[1])
202
 
        self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
203
 
                          revisions[1])
204
 
        self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
205
 
                          revisions[2])
206
 
        self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
207
 
                          revisions_2[4])
208
 
        self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
209
 
                          revisions_2[4])
210
 
        self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
211
 
                          revisions[4])
212
 
        self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
213
 
                          revisions[4])
214
 
 
 
111
TEST_CLASSES = [
 
112
    TestIsAncestor,
 
113
    TestCommonAncestor,
 
114
    ]