← 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
  • Date: 2005-09-19 02:33:09 UTC
  • mfrom: (1185.3.27)
  • mto: (1185.1.29)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: aaron.bentley@utoronto.ca-20050919023309-24e8871f7f8b31cf
Merged latest from mpool

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testrevision.py
22
22
    from bzrlib.commit import commit
23
23
    import os
24
24
    os.mkdir("branch1")
25
 
    br1 = Branch("branch1", init=True)
 
25
    br1 = Branch.initialize("branch1")
26
26
    
27
27
    commit(br1, "Commit one", rev_id="a@u-0-0")
28
28
    commit(br1, "Commit two", rev_id="a@u-0-1")
29
29
    commit(br1, "Commit three", rev_id="a@u-0-2")
30
30
 
31
31
    os.mkdir("branch2")
32
 
    br2 = Branch("branch2", init=True)
 
32
    br2 = Branch.initialize("branch2")
33
33
    br2.update_revisions(br1)
34
34
    commit(br2, "Commit four", rev_id="b@u-0-3")
35
35
    commit(br2, "Commit five", rev_id="b@u-0-4")
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"""