← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revision.py

  • Committer: John Arbash Meinel
  • Date: 2006-07-03 18:27:35 UTC
  • mto: This revision was merged to the branch mainline in revision 1851.
  • Revision ID: john@arbash-meinel.com-20060703182735-3081f13e92d7f657
WorkingTree.open_containing() was directly calling os.getcwdu(), which on mac returns the wrong normalization, and on win32 would have the wrong slashes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revision.py
16
16
 
17
17
 
18
18
import os
 
19
import warnings
19
20
 
20
 
from bzrlib.selftest import TestCaseInTempDir
21
21
from bzrlib.branch import Branch
22
 
from bzrlib.commit import commit
23
 
from bzrlib.fetch import fetch
 
22
from bzrlib.errors import NoSuchRevision
 
23
from bzrlib.graph import Graph
24
24
from bzrlib.revision import (find_present_ancestors, combined_graph,
 
25
                             common_ancestor,
25
26
                             is_ancestor, MultipleRevisionSources)
 
27
from bzrlib.tests import TestCaseWithTransport
26
28
from bzrlib.trace import mutter
27
 
from bzrlib.errors import NoSuchRevision
28
 
 
29
 
def make_branches():
 
29
from bzrlib.workingtree import WorkingTree
 
30
 
 
31
# We're allowed to test deprecated interfaces
 
32
warnings.filterwarnings('ignore',
 
33
        '.*get_intervening_revisions was deprecated',
 
34
        DeprecationWarning,
 
35
        r'bzrlib\.tests\.test_revision')
 
36
 
 
37
# XXX: Make this a method of a merge base case
 
38
def make_branches(self):
30
39
    """Create two branches
31
40
 
32
41
    branch 1 has 6 commits, branch 2 has 3 commits
33
 
    commit 10 was a psuedo merge from branch 1
34
 
    but has been disabled until ghost support is
35
 
    implemented.
 
42
    commit 10 is a ghosted merge merge from branch 1
36
43
 
37
44
    the object graph is
38
45
    B:     A:
47
54
    so A is missing b6 at the start
48
55
    and B is missing a3, a4, a5
49
56
    """
50
 
    os.mkdir("branch1")
51
 
    br1 = Branch.initialize("branch1")
 
57
    tree1 = self.make_branch_and_tree("branch1")
 
58
    br1 = tree1.branch
52
59
    
53
 
    commit(br1, "Commit one", rev_id="a@u-0-0")
54
 
    commit(br1, "Commit two", rev_id="a@u-0-1")
55
 
    commit(br1, "Commit three", rev_id="a@u-0-2")
 
60
    tree1.commit("Commit one", rev_id="a@u-0-0")
 
61
    tree1.commit("Commit two", rev_id="a@u-0-1")
 
62
    tree1.commit("Commit three", rev_id="a@u-0-2")
56
63
 
57
 
    os.mkdir("branch2")
58
 
    br2 = Branch.initialize("branch2")
59
 
    br2.update_revisions(br1)
60
 
    commit(br2, "Commit four", rev_id="b@u-0-3")
61
 
    commit(br2, "Commit five", rev_id="b@u-0-4")
 
64
    tree2 = tree1.bzrdir.clone("branch2").open_workingtree()
 
65
    br2 = tree2.branch
 
66
    tree2.commit("Commit four", rev_id="b@u-0-3")
 
67
    tree2.commit("Commit five", rev_id="b@u-0-4")
62
68
    revisions_2 = br2.revision_history()
63
69
    
64
 
    fetch(from_branch=br2, to_branch=br1)
65
 
    br1.add_pending_merge(revisions_2[4])
66
 
    assert revisions_2[4] == 'b@u-0-4'
67
 
    commit(br1, "Commit six", rev_id="a@u-0-3")
68
 
    commit(br1, "Commit seven", rev_id="a@u-0-4")
69
 
    commit(br2, "Commit eight", rev_id="b@u-0-5")
 
70
    br1.fetch(br2)
 
71
    tree1.add_pending_merge(revisions_2[4])
 
72
    self.assertEquals(revisions_2[4], 'b@u-0-4')
 
73
    tree1.commit("Commit six", rev_id="a@u-0-3")
 
74
    tree1.commit("Commit seven", rev_id="a@u-0-4")
 
75
    tree2.commit("Commit eight", rev_id="b@u-0-5")
70
76
    
71
 
    fetch(from_branch=br2, to_branch=br1)
72
 
    br1.add_pending_merge(br2.revision_history()[5])
73
 
    commit(br1, "Commit nine", rev_id="a@u-0-5")
 
77
    br1.fetch(br2)
 
78
    tree1.add_pending_merge(br2.revision_history()[5])
 
79
    tree1.commit("Commit nine", rev_id="a@u-0-5")
74
80
    # DO NOT FETCH HERE - we WANT a GHOST.
75
 
    #fetch(from_branch=br1, to_branch=br2)
76
 
    br2.add_pending_merge(br1.revision_history()[4])
77
 
    commit(br2, "Commit ten - ghost merge", rev_id="b@u-0-6")
 
81
    # br2.fetch(br1)
 
82
    tree2.add_pending_merge(br1.revision_history()[4])
 
83
    tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6")
78
84
    
79
85
    return br1, br2
80
86
 
81
87
 
82
 
class TestIsAncestor(TestCaseInTempDir):
 
88
class TestIsAncestor(TestCaseWithTransport):
 
89
 
83
90
    def test_recorded_ancestry(self):
84
91
        """Test that commit records all ancestors"""
85
 
        br1, br2 = make_branches()
 
92
        br1, br2 = make_branches(self)
86
93
        d = [('a@u-0-0', ['a@u-0-0']),
87
94
             ('a@u-0-1', ['a@u-0-0', 'a@u-0-1']),
88
95
             ('a@u-0-2', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2']),
111
118
                if rev_id in br2_only and not branch is br2:
112
119
                    continue
113
120
                mutter('ancestry of {%s}: %r',
114
 
                       rev_id, branch.get_ancestry(rev_id))
115
 
                self.assertEquals(sorted(branch.get_ancestry(rev_id)),
116
 
                                  [None] + sorted(anc))
 
121
                       rev_id, branch.repository.get_ancestry(rev_id))
 
122
                result = sorted(branch.repository.get_ancestry(rev_id))
 
123
                self.assertEquals(result, [None] + sorted(anc))
117
124
    
118
125
    
119
126
    def test_is_ancestor(self):
120
127
        """Test checking whether a revision is an ancestor of another revision"""
121
 
        br1, br2 = make_branches()
 
128
        br1, br2 = make_branches(self)
122
129
        revisions = br1.revision_history()
123
130
        revisions_2 = br2.revision_history()
124
131
        sources = br1
125
132
 
126
 
        assert is_ancestor(revisions[0], revisions[0], br1)
127
 
        assert is_ancestor(revisions[1], revisions[0], sources)
128
 
        assert not is_ancestor(revisions[0], revisions[1], sources)
129
 
        assert is_ancestor(revisions_2[3], revisions[0], sources)
 
133
        self.assert_(is_ancestor(revisions[0], revisions[0], br1))
 
134
        self.assert_(is_ancestor(revisions[1], revisions[0], sources))
 
135
        self.assert_(not is_ancestor(revisions[0], revisions[1], sources))
 
136
        self.assert_(is_ancestor(revisions_2[3], revisions[0], sources))
130
137
        # disabled mbp 20050914, doesn't seem to happen anymore
131
138
        ## self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
132
139
        ##                  revisions[0], br1)        
133
 
        assert is_ancestor(revisions[3], revisions_2[4], sources)
134
 
        assert is_ancestor(revisions[3], revisions_2[4], br1)
135
 
        assert is_ancestor(revisions[3], revisions_2[3], sources)
136
 
        ## assert not is_ancestor(revisions[3], revisions_2[3], br1)
137
 
 
138
 
 
139
 
class TestIntermediateRevisions(TestCaseInTempDir):
 
140
        self.assert_(is_ancestor(revisions[3], revisions_2[4], sources))
 
141
        self.assert_(is_ancestor(revisions[3], revisions_2[4], br1))
 
142
        self.assert_(is_ancestor(revisions[3], revisions_2[3], sources))
 
143
        ## self.assert_(not is_ancestor(revisions[3], revisions_2[3], br1))
 
144
 
 
145
 
 
146
class TestIntermediateRevisions(TestCaseWithTransport):
140
147
 
141
148
    def setUp(self):
142
 
        from bzrlib.commit import commit
143
 
        TestCaseInTempDir.setUp(self)
144
 
        self.br1, self.br2 = make_branches()
145
 
 
146
 
        self.br2.commit("Commit eleven", rev_id="b@u-0-7")
147
 
        self.br2.commit("Commit twelve", rev_id="b@u-0-8")
148
 
        self.br2.commit("Commit thirtteen", rev_id="b@u-0-9")
149
 
 
150
 
        fetch(from_branch=self.br2, to_branch=self.br1)
151
 
        self.br1.add_pending_merge(self.br2.revision_history()[6])
152
 
        self.br1.commit("Commit fourtten", rev_id="a@u-0-6")
153
 
 
154
 
        fetch(from_branch=self.br1, to_branch=self.br2)
155
 
        self.br2.add_pending_merge(self.br1.revision_history()[6])
156
 
        self.br2.commit("Commit fifteen", rev_id="b@u-0-10")
 
149
        TestCaseWithTransport.setUp(self)
 
150
        self.br1, self.br2 = make_branches(self)
 
151
        wt1 = self.br1.bzrdir.open_workingtree()
 
152
        wt2 = self.br2.bzrdir.open_workingtree()
 
153
        wt2.commit("Commit eleven", rev_id="b@u-0-7")
 
154
        wt2.commit("Commit twelve", rev_id="b@u-0-8")
 
155
        wt2.commit("Commit thirtteen", rev_id="b@u-0-9")
 
156
 
 
157
        self.br1.fetch(self.br2)
 
158
        wt1.add_pending_merge(self.br2.revision_history()[6])
 
159
        wt1.commit("Commit fourtten", rev_id="a@u-0-6")
 
160
 
 
161
        self.br2.fetch(self.br1)
 
162
        wt2.add_pending_merge(self.br1.revision_history()[6])
 
163
        wt2.commit("Commit fifteen", rev_id="b@u-0-10")
157
164
 
158
165
        from bzrlib.revision import MultipleRevisionSources
159
 
        self.sources = MultipleRevisionSources(self.br1, self.br2)
160
 
 
161
 
    def intervene(self, ancestor, revision, revision_history=None):
162
 
        from bzrlib.revision import get_intervening_revisions
163
 
        return get_intervening_revisions(ancestor,revision, self.sources, 
164
 
                                         revision_history)
165
 
 
166
 
    def test_intervene(self):
167
 
        """Find intermediate revisions, without requiring history"""
168
 
        from bzrlib.errors import NotAncestor, NoSuchRevision
169
 
        assert len(self.intervene('a@u-0-0', 'a@u-0-0')) == 0
170
 
        self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-1'), ['a@u-0-1'])
171
 
        self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-2'), 
172
 
                         ['a@u-0-1', 'a@u-0-2'])
173
 
        self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-3'), 
174
 
                         ['a@u-0-1', 'a@u-0-2', 'b@u-0-3'])
175
 
        self.assertEqual(self.intervene('b@u-0-3', 'a@u-0-3'), 
176
 
                         ['b@u-0-4', 'a@u-0-3'])
177
 
        self.assertEqual(self.intervene('a@u-0-2', 'a@u-0-3', 
178
 
                                        self.br1.revision_history()), 
179
 
                         ['a@u-0-3'])
180
 
        self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-5', 
181
 
                                        self.br1.revision_history()), 
182
 
                         ['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4', 
183
 
                          'a@u-0-5'])
184
 
        print ("testrevision.py 191 - intervene appears to return b..6 even"
185
 
               "though it is not reachable!")
186
 
#        self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-6', 
187
 
#                         self.br1.revision_history()), 
188
 
#                         ['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4', 
189
 
#                          'b@u-0-6'])
190
 
#        self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-5'), 
191
 
#                         ['a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4', 
192
 
#                          'b@u-0-5'])
193
 
        self.assertEqual(self.intervene('b@u-0-3', 'b@u-0-6', 
194
 
                         self.br2.revision_history()), 
195
 
                         ['b@u-0-4', 'b@u-0-5', 'b@u-0-6'])
196
 
        self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10'), 
197
 
                         ['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
198
 
        self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10', 
199
 
                                        self.br2.revision_history()), 
200
 
                         ['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
201
 
        self.assertRaises(NotAncestor, self.intervene, 'b@u-0-10', 'b@u-0-6', 
202
 
                          self.br2.revision_history())
203
 
        self.assertRaises(NoSuchRevision, self.intervene, 'c@u-0-10', 
204
 
                          'b@u-0-6', self.br2.revision_history())
205
 
        self.assertRaises(NoSuchRevision, self.intervene, 'b@u-0-10', 
206
 
                          'c@u-0-6', self.br2.revision_history())
207
 
 
208
 
 
209
 
class TestCommonAncestor(TestCaseInTempDir):
 
166
        self.sources = MultipleRevisionSources(self.br1.repository,
 
167
                                               self.br2.repository)
 
168
 
 
169
 
 
170
 
 
171
class MockRevisionSource(object):
 
172
    """A RevisionSource that takes a pregenerated graph.
 
173
 
 
174
    This is useful for testing revision graph algorithms where
 
175
    the actual branch existing is irrelevant.
 
176
    """
 
177
 
 
178
    def __init__(self, full_graph):
 
179
        self._full_graph = full_graph
 
180
 
 
181
    def get_revision_graph_with_ghosts(self, revision_ids):
 
182
        # This is mocked out to just return a constant graph.
 
183
        return self._full_graph
 
184
 
 
185
 
 
186
class TestCommonAncestor(TestCaseWithTransport):
210
187
    """Test checking whether a revision is an ancestor of another revision"""
211
188
 
212
 
    def test_old_common_ancestor(self):
213
 
        """Pick a resonable merge base using the old functionality"""
214
 
        from bzrlib.revision import old_common_ancestor as common_ancestor
215
 
        br1, br2 = make_branches()
216
 
        revisions = br1.revision_history()
217
 
        revisions_2 = br2.revision_history()
218
 
        sources = br1
219
 
 
220
 
        expected_ancestors_list = {revisions[3]:(0, 0), 
221
 
                                   revisions[2]:(1, 1),
222
 
                                   revisions_2[4]:(2, 1), 
223
 
                                   revisions[1]:(3, 2),
224
 
                                   revisions_2[3]:(4, 2),
225
 
                                   revisions[0]:(5, 3) }
226
 
        ancestors_list = find_present_ancestors(revisions[3], sources)
227
 
        assert len(expected_ancestors_list) == len(ancestors_list)
228
 
        for key, value in expected_ancestors_list.iteritems():
229
 
            self.assertEqual(ancestors_list[key], value, 
230
 
                              "key %r, %r != %r" % (key, ancestors_list[key],
231
 
                                                    value))
232
 
 
233
 
        self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
234
 
                          revisions[0])
235
 
        self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
236
 
                          revisions[1])
237
 
        self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
238
 
                          revisions[1])
239
 
        self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
240
 
                          revisions[2])
241
 
        self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
242
 
                          revisions_2[4])
243
 
        self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
244
 
                          revisions_2[4])
245
 
        fetch(from_branch=br2, to_branch=br1)
246
 
        self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
247
 
                          revisions[4]) # revisions_2[5] is equally valid
248
 
        self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
249
 
                          revisions_2[5])
250
 
 
251
189
    def test_common_ancestor(self):
252
190
        """Pick a reasonable merge base"""
253
 
        from bzrlib.revision import common_ancestor
254
 
        br1, br2 = make_branches()
 
191
        br1, br2 = make_branches(self)
255
192
        revisions = br1.revision_history()
256
193
        revisions_2 = br2.revision_history()
257
 
        sources = MultipleRevisionSources(br1, br2)
 
194
        sources = MultipleRevisionSources(br1.repository, br2.repository)
258
195
        expected_ancestors_list = {revisions[3]:(0, 0), 
259
196
                                   revisions[2]:(1, 1),
260
197
                                   revisions_2[4]:(2, 1), 
262
199
                                   revisions_2[3]:(4, 2),
263
200
                                   revisions[0]:(5, 3) }
264
201
        ancestors_list = find_present_ancestors(revisions[3], sources)
265
 
        assert len(expected_ancestors_list) == len(ancestors_list)
 
202
        self.assertEquals(len(expected_ancestors_list), len(ancestors_list))
266
203
        for key, value in expected_ancestors_list.iteritems():
267
204
            self.assertEqual(ancestors_list[key], value, 
268
205
                              "key %r, %r != %r" % (key, ancestors_list[key],
279
216
                          revisions_2[4])
280
217
        self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
281
218
                          revisions_2[4])
282
 
        self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
283
 
                          revisions[4]) # revisions_2[5] is equally valid
284
 
        self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
285
 
                          revisions[4]) # revisions_2[5] is equally valid
 
219
        self.assertTrue(common_ancestor(revisions[5], revisions_2[6], sources) in
 
220
                        (revisions[4], revisions_2[5]))
 
221
        self.assertTrue(common_ancestor(revisions_2[6], revisions[5], sources),
 
222
                        (revisions[4], revisions_2[5]))
 
223
        self.assertEqual(None, common_ancestor(None, revisions[5], sources))
286
224
 
287
225
    def test_combined(self):
288
226
        """combined_graph
289
227
        Ensure it's not order-sensitive
290
228
        """
291
 
        br1, br2 = make_branches()
292
 
        source = MultipleRevisionSources(br1, br2)
 
229
        br1, br2 = make_branches(self)
 
230
        source = MultipleRevisionSources(br1.repository, br2.repository)
293
231
        combined_1 = combined_graph(br1.last_revision(), 
294
232
                                    br2.last_revision(), source)
295
233
        combined_2 = combined_graph(br2.last_revision(),
296
234
                                    br1.last_revision(), source)
297
 
        assert combined_1[1] == combined_2[1]
298
 
        assert combined_1[2] == combined_2[2]
299
 
        assert combined_1[3] == combined_2[3]
300
 
        assert combined_1 == combined_2
 
235
        self.assertEquals(combined_1[1], combined_2[1])
 
236
        self.assertEquals(combined_1[2], combined_2[2])
 
237
        self.assertEquals(combined_1[3], combined_2[3])
 
238
        self.assertEquals(combined_1, combined_2)
 
239
 
 
240
    def test_get_history(self):
 
241
        # TODO: test ghosts on the left hand branch's impact
 
242
        # TODO: test ghosts on all parents, we should get some
 
243
        # indicator. i.e. NULL_REVISION
 
244
        # RBC 20060608
 
245
        tree = self.make_branch_and_tree('.')
 
246
        tree.commit('1', rev_id = '1', allow_pointless=True)
 
247
        tree.commit('2', rev_id = '2', allow_pointless=True)
 
248
        tree.commit('3', rev_id = '3', allow_pointless=True)
 
249
        rev = tree.branch.repository.get_revision('1')
 
250
        history = rev.get_history(tree.branch.repository)
 
251
        self.assertEqual([None, '1'], history)
 
252
        rev = tree.branch.repository.get_revision('2')
 
253
        history = rev.get_history(tree.branch.repository)
 
254
        self.assertEqual([None, '1', '2'], history)
 
255
        rev = tree.branch.repository.get_revision('3')
 
256
        history = rev.get_history(tree.branch.repository)
 
257
        self.assertEqual([None, '1', '2' ,'3'], history)
 
258
 
 
259
    def test_common_ancestor_rootless_graph(self):
 
260
        # common_ancestor on a graph with no reachable roots - only
 
261
        # ghosts - should still return a useful value.
 
262
        graph = Graph()
 
263
        # add a ghost node which would be a root if it wasn't a ghost.
 
264
        graph.add_ghost('a_ghost')
 
265
        # add a normal commit on top of that
 
266
        graph.add_node('rev1', ['a_ghost'])
 
267
        # add a left-branch revision
 
268
        graph.add_node('left', ['rev1'])
 
269
        # add a right-branch revision
 
270
        graph.add_node('right', ['rev1'])
 
271
        source = MockRevisionSource(graph)
 
272
        self.assertEqual('rev1', common_ancestor('left', 'right', source))
 
273
 
 
274
 
 
275
class TestMultipleRevisionSources(TestCaseWithTransport):
 
276
    """Tests for the MultipleRevisionSources adapter."""
 
277
 
 
278
    def test_get_revision_graph_merges_ghosts(self):
 
279
        # when we ask for the revision graph for B, which
 
280
        # is in repo 1 with a ghost of A, and which is not
 
281
        # in repo 2, which has A, the revision_graph()
 
282
        # should return A and B both.
 
283
        tree_1 = self.make_branch_and_tree('1')
 
284
        tree_1.add_pending_merge('A')
 
285
        tree_1.commit('foo', rev_id='B', allow_pointless=True)
 
286
        tree_2 = self.make_branch_and_tree('2')
 
287
        tree_2.commit('bar', rev_id='A', allow_pointless=True)
 
288
        source = MultipleRevisionSources(tree_1.branch.repository,
 
289
                                         tree_2.branch.repository)
 
290
        self.assertEqual({'B':['A'],
 
291
                          'A':[]},
 
292
                         source.get_revision_graph('B'))