/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revision.py

Merge from mbp.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revision.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
18
 
 
19
 
 
20
 
def make_branches():
21
 
    from bzrlib.branch import Branch
22
 
    from bzrlib.commit import commit
23
 
    import os
 
17
 
 
18
import os
 
19
 
 
20
from bzrlib.tests import TestCaseInTempDir
 
21
from bzrlib.branch import Branch
 
22
from bzrlib.commit import commit
 
23
from bzrlib.fetch import fetch
 
24
from bzrlib.revision import (find_present_ancestors, combined_graph,
 
25
                             is_ancestor, MultipleRevisionSources)
 
26
from bzrlib.trace import mutter
 
27
from bzrlib.errors import NoSuchRevision
 
28
 
 
29
# XXX: Make this a method of a merge base case
 
30
def make_branches(self):
 
31
    """Create two branches
 
32
 
 
33
    branch 1 has 6 commits, branch 2 has 3 commits
 
34
    commit 10 was a psuedo merge from branch 1
 
35
    but has been disabled until ghost support is
 
36
    implemented.
 
37
 
 
38
    the object graph is
 
39
    B:     A:
 
40
    a..0   a..0 
 
41
    a..1   a..1
 
42
    a..2   a..2
 
43
    b..3   a..3 merges b..4
 
44
    b..4   a..4
 
45
    b..5   a..5 merges b..5
 
46
    b..6 merges a4
 
47
 
 
48
    so A is missing b6 at the start
 
49
    and B is missing a3, a4, a5
 
50
    """
24
51
    os.mkdir("branch1")
25
52
    br1 = Branch.initialize("branch1")
26
53
    
34
61
    commit(br2, "Commit four", rev_id="b@u-0-3")
35
62
    commit(br2, "Commit five", rev_id="b@u-0-4")
36
63
    revisions_2 = br2.revision_history()
37
 
    br1.add_pending_merge(revisions_2[4])
 
64
    
 
65
    fetch(from_branch=br2, to_branch=br1)
 
66
    br1.working_tree().add_pending_merge(revisions_2[4])
 
67
    self.assertEquals(revisions_2[4], 'b@u-0-4')
38
68
    commit(br1, "Commit six", rev_id="a@u-0-3")
39
69
    commit(br1, "Commit seven", rev_id="a@u-0-4")
40
70
    commit(br2, "Commit eight", rev_id="b@u-0-5")
41
 
    br1.add_pending_merge(br2.revision_history()[5])
 
71
    
 
72
    fetch(from_branch=br2, to_branch=br1)
 
73
    br1.working_tree().add_pending_merge(br2.revision_history()[5])
42
74
    commit(br1, "Commit nine", rev_id="a@u-0-5")
43
 
    br2.add_pending_merge(br1.revision_history()[4])
44
 
    commit(br2, "Commit ten", rev_id="b@u-0-6")
 
75
    # DO NOT FETCH HERE - we WANT a GHOST.
 
76
    #fetch(from_branch=br1, to_branch=br2)
 
77
    br2.working_tree().add_pending_merge(br1.revision_history()[4])
 
78
    commit(br2, "Commit ten - ghost merge", rev_id="b@u-0-6")
 
79
    
45
80
    return br1, br2
46
81
 
47
82
 
48
83
class TestIsAncestor(TestCaseInTempDir):
 
84
    def test_recorded_ancestry(self):
 
85
        """Test that commit records all ancestors"""
 
86
        br1, br2 = make_branches(self)
 
87
        d = [('a@u-0-0', ['a@u-0-0']),
 
88
             ('a@u-0-1', ['a@u-0-0', 'a@u-0-1']),
 
89
             ('a@u-0-2', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2']),
 
90
             ('b@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3']),
 
91
             ('b@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3',
 
92
                          'b@u-0-4']),
 
93
             ('a@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
 
94
                          'a@u-0-3']),
 
95
             ('a@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
 
96
                          'a@u-0-3', 'a@u-0-4']),
 
97
             ('b@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
 
98
                          'b@u-0-5']),
 
99
             ('a@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
 
100
                          'b@u-0-3', 'b@u-0-4',
 
101
                          'b@u-0-5', 'a@u-0-5']),
 
102
             ('b@u-0-6', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2',
 
103
                          'b@u-0-3', 'b@u-0-4',
 
104
                          'b@u-0-5', 'b@u-0-6']),
 
105
             ]
 
106
        br1_only = ('a@u-0-3', 'a@u-0-4', 'a@u-0-5')
 
107
        br2_only = ('b@u-0-6',)
 
108
        for branch in br1, br2:
 
109
            for rev_id, anc in d:
 
110
                if rev_id in br1_only and not branch is br1:
 
111
                    continue
 
112
                if rev_id in br2_only and not branch is br2:
 
113
                    continue
 
114
                mutter('ancestry of {%s}: %r',
 
115
                       rev_id, branch.get_ancestry(rev_id))
 
116
                self.assertEquals(sorted(branch.get_ancestry(rev_id)),
 
117
                                  [None] + sorted(anc))
 
118
    
 
119
    
49
120
    def test_is_ancestor(self):
50
121
        """Test checking whether a revision is an ancestor of another revision"""
51
 
        from bzrlib.revision import is_ancestor, MultipleRevisionSources
52
 
        from bzrlib.errors import NoSuchRevision
53
 
        br1, br2 = make_branches()
 
122
        br1, br2 = make_branches(self)
54
123
        revisions = br1.revision_history()
55
124
        revisions_2 = br2.revision_history()
56
 
        sources = MultipleRevisionSources(br1, br2)
57
 
 
58
 
        assert is_ancestor(revisions[0], revisions[0], sources)
59
 
        assert is_ancestor(revisions[1], revisions[0], sources)
60
 
        assert not is_ancestor(revisions[0], revisions[1], sources)
61
 
        assert is_ancestor(revisions_2[3], revisions[0], sources)
62
 
        self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
63
 
                          revisions[0], br1)        
64
 
        assert is_ancestor(revisions[3], revisions_2[4], sources)
65
 
        assert is_ancestor(revisions[3], revisions_2[4], br1)
66
 
        assert is_ancestor(revisions[3], revisions_2[3], sources)
67
 
        assert not is_ancestor(revisions[3], revisions_2[3], br1)
68
 
 
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
 
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
 
125
        sources = br1
 
126
 
 
127
        self.assert_(is_ancestor(revisions[0], revisions[0], br1))
 
128
        self.assert_(is_ancestor(revisions[1], revisions[0], sources))
 
129
        self.assert_(not is_ancestor(revisions[0], revisions[1], sources))
 
130
        self.assert_(is_ancestor(revisions_2[3], revisions[0], sources))
 
131
        # disabled mbp 20050914, doesn't seem to happen anymore
 
132
        ## self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
 
133
        ##                  revisions[0], br1)        
 
134
        self.assert_(is_ancestor(revisions[3], revisions_2[4], sources))
 
135
        self.assert_(is_ancestor(revisions[3], revisions_2[4], br1))
 
136
        self.assert_(is_ancestor(revisions[3], revisions_2[3], sources))
 
137
        ## self.assert_(not is_ancestor(revisions[3], revisions_2[3], br1))
 
138
 
 
139
 
 
140
class TestIntermediateRevisions(TestCaseInTempDir):
 
141
 
 
142
    def setUp(self):
 
143
        from bzrlib.commit import commit
 
144
        TestCaseInTempDir.setUp(self)
 
145
        self.br1, self.br2 = make_branches(self)
 
146
 
 
147
        self.br2.working_tree().commit("Commit eleven", rev_id="b@u-0-7")
 
148
        self.br2.working_tree().commit("Commit twelve", rev_id="b@u-0-8")
 
149
        self.br2.working_tree().commit("Commit thirtteen", rev_id="b@u-0-9")
 
150
 
 
151
        fetch(from_branch=self.br2, to_branch=self.br1)
 
152
        self.br1.working_tree().add_pending_merge(self.br2.revision_history()[6])
 
153
        self.br1.working_tree().commit("Commit fourtten", rev_id="a@u-0-6")
 
154
 
 
155
        fetch(from_branch=self.br1, to_branch=self.br2)
 
156
        self.br2.working_tree().add_pending_merge(self.br1.revision_history()[6])
 
157
        self.br2.working_tree().commit("Commit fifteen", rev_id="b@u-0-10")
 
158
 
 
159
        from bzrlib.revision import MultipleRevisionSources
 
160
        self.sources = MultipleRevisionSources(self.br1, self.br2)
 
161
 
 
162
    def intervene(self, ancestor, revision, revision_history=None):
 
163
        from bzrlib.revision import get_intervening_revisions
 
164
        return get_intervening_revisions(ancestor,revision, self.sources, 
 
165
                                         revision_history)
 
166
 
 
167
    def test_intervene(self):
 
168
        """Find intermediate revisions, without requiring history"""
 
169
        from bzrlib.errors import NotAncestor, NoSuchRevision
 
170
        self.assertEquals(len(self.intervene('a@u-0-0', 'a@u-0-0')), 0)
157
171
        self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-1'), ['a@u-0-1'])
158
172
        self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-2'), 
159
173
                         ['a@u-0-1', 'a@u-0-2'])
196
210
 
197
211
    def test_old_common_ancestor(self):
198
212
        """Pick a resonable merge base using the old functionality"""
199
 
        from bzrlib.revision import find_present_ancestors
200
213
        from bzrlib.revision import old_common_ancestor as common_ancestor
201
 
        from bzrlib.revision import MultipleRevisionSources
202
 
        br1, br2 = make_branches()
 
214
        br1, br2 = make_branches(self)
203
215
        revisions = br1.revision_history()
204
216
        revisions_2 = br2.revision_history()
205
 
        sources = MultipleRevisionSources(br1, br2)
 
217
        sources = br1
206
218
 
207
219
        expected_ancestors_list = {revisions[3]:(0, 0), 
208
220
                                   revisions[2]:(1, 1),
211
223
                                   revisions_2[3]:(4, 2),
212
224
                                   revisions[0]:(5, 3) }
213
225
        ancestors_list = find_present_ancestors(revisions[3], sources)
214
 
        assert len(expected_ancestors_list) == len(ancestors_list)
 
226
        self.assertEquals(len(expected_ancestors_list), len(ancestors_list))
215
227
        for key, value in expected_ancestors_list.iteritems():
216
228
            self.assertEqual(ancestors_list[key], value, 
217
229
                              "key %r, %r != %r" % (key, ancestors_list[key],
229
241
                          revisions_2[4])
230
242
        self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
231
243
                          revisions_2[4])
 
244
        fetch(from_branch=br2, to_branch=br1)
232
245
        self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
233
 
                          revisions[4])
 
246
                          revisions[4]) # revisions_2[5] is equally valid
234
247
        self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
235
248
                          revisions_2[5])
236
249
 
237
250
    def test_common_ancestor(self):
238
251
        """Pick a reasonable merge base"""
239
 
        from bzrlib.revision import find_present_ancestors
240
252
        from bzrlib.revision import common_ancestor
241
 
        from bzrlib.revision import MultipleRevisionSources
242
 
        br1, br2 = make_branches()
 
253
        br1, br2 = make_branches(self)
243
254
        revisions = br1.revision_history()
244
255
        revisions_2 = br2.revision_history()
245
256
        sources = MultipleRevisionSources(br1, br2)
246
 
 
247
257
        expected_ancestors_list = {revisions[3]:(0, 0), 
248
258
                                   revisions[2]:(1, 1),
249
259
                                   revisions_2[4]:(2, 1), 
251
261
                                   revisions_2[3]:(4, 2),
252
262
                                   revisions[0]:(5, 3) }
253
263
        ancestors_list = find_present_ancestors(revisions[3], sources)
254
 
        assert len(expected_ancestors_list) == len(ancestors_list)
 
264
        self.assertEquals(len(expected_ancestors_list), len(ancestors_list))
255
265
        for key, value in expected_ancestors_list.iteritems():
256
266
            self.assertEqual(ancestors_list[key], value, 
257
267
                              "key %r, %r != %r" % (key, ancestors_list[key],
258
268
                                                    value))
259
 
 
260
269
        self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
261
270
                          revisions[0])
262
271
        self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
270
279
        self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
271
280
                          revisions_2[4])
272
281
        self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
273
 
                          revisions[4])
 
282
                          revisions[4]) # revisions_2[5] is equally valid
274
283
        self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
275
 
                          revisions[4])
 
284
                          revisions[4]) # revisions_2[5] is equally valid
276
285
 
 
286
    def test_combined(self):
 
287
        """combined_graph
 
288
        Ensure it's not order-sensitive
 
289
        """
 
290
        br1, br2 = make_branches(self)
 
291
        source = MultipleRevisionSources(br1, br2)
 
292
        combined_1 = combined_graph(br1.last_revision(), 
 
293
                                    br2.last_revision(), source)
 
294
        combined_2 = combined_graph(br2.last_revision(),
 
295
                                    br1.last_revision(), source)
 
296
        self.assertEquals(combined_1[1], combined_2[1])
 
297
        self.assertEquals(combined_1[2], combined_2[2])
 
298
        self.assertEquals(combined_1[3], combined_2[3])
 
299
        self.assertEquals(combined_1, combined_2)