← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_missing.py

(vila) Fix test failures blocking package builds. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_missing.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005-2009, 2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
 
 
17
 
import os
18
 
 
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19
16
 
20
17
from bzrlib import (
21
18
    missing,
25
22
    iter_log_revisions,
26
23
    )
27
24
from bzrlib.tests import TestCaseWithTransport
28
 
from bzrlib.workingtree import WorkingTree
29
25
 
30
26
 
31
27
class TestMissing(TestCaseWithTransport):
32
28
 
33
 
    def assertUnmerged(self, expected, source, target, restrict='all'):
34
 
        unmerged = missing.find_unmerged(source, target, restrict=restrict)
 
29
    def assertUnmerged(self, expected, source, target, restrict='all',
 
30
                       backward=False):
 
31
        unmerged = missing.find_unmerged(source, target, restrict=restrict,
 
32
                                         backward=backward)
35
33
        self.assertEqual(expected, unmerged)
36
 
            
 
34
 
37
35
    def test_find_unmerged(self):
38
36
        original_tree = self.make_branch_and_tree('original')
39
37
        original = original_tree.branch
43
41
        merger = merger_tree.branch
44
42
        self.assertUnmerged(([], []), original, puller)
45
43
        original_tree.commit('a', rev_id='a')
46
 
        self.assertUnmerged(([(1, 'a')], []), original, puller)
 
44
        self.assertUnmerged(([('1', 'a')], []), original, puller)
47
45
        puller_tree.pull(original)
48
46
        self.assertUnmerged(([], []), original, puller)
49
47
        merger_tree.pull(original)
50
48
        original_tree.commit('b', rev_id='b')
51
49
        original_tree.commit('c', rev_id='c')
52
 
        self.assertUnmerged(([(2, 'b'), (3, 'c')], []),
 
50
        self.assertUnmerged(([('2', 'b'), ('3', 'c')], []),
53
51
                            original, puller)
 
52
        self.assertUnmerged(([('3', 'c'), ('2', 'b')], []),
 
53
                            original, puller, backward=True)
54
54
 
55
55
        puller_tree.pull(original)
56
56
        self.assertUnmerged(([], []), original, puller)
57
 
        self.assertUnmerged(([(2, 'b'), (3, 'c')], []),
 
57
        self.assertUnmerged(([('2', 'b'), ('3', 'c')], []),
58
58
                            original, merger)
59
59
        merger_tree.merge_from_branch(original)
60
 
        self.assertUnmerged(([(2, 'b'), (3, 'c')], []),
 
60
        self.assertUnmerged(([('2', 'b'), ('3', 'c')], []),
61
61
                            original, merger)
62
62
        merger_tree.commit('d', rev_id='d')
63
 
        self.assertUnmerged(([], [(2, 'd')]), original, merger)
 
63
        self.assertUnmerged(([], [('2', 'd')]), original, merger)
64
64
 
65
65
    def test_iter_log_revisions(self):
66
66
        base_tree = self.make_branch_and_tree('base')
85
85
 
86
86
        base_extra, child_extra = missing.find_unmerged(base_tree.branch,
87
87
                                                        child_tree.branch)
88
 
        results = list(iter_log_revisions(base_extra, 
 
88
        results = list(iter_log_revisions(base_extra,
89
89
                            base_tree.branch.repository,
90
90
                            verbose=True))
91
91
        self.assertEqual([], results)
97
97
 
98
98
        r0,r1,r2,r3 = results
99
99
 
100
 
        self.assertEqual((2, 'c-2'), (r0.revno, r0.rev.revision_id))
101
 
        self.assertEqual((3, 'c-3'), (r1.revno, r1.rev.revision_id))
102
 
        self.assertEqual((4, 'c-4'), (r2.revno, r2.rev.revision_id))
103
 
        self.assertEqual((5, 'c-5'), (r3.revno, r3.rev.revision_id))
 
100
        self.assertEqual([('2', 'c-2'), ('3', 'c-3'),
 
101
                          ('4', 'c-4'), ('5', 'c-5'),],
 
102
                         [(r.revno, r.rev.revision_id) for r in results])
104
103
 
105
104
        delta0 = r0.delta
106
105
        self.assertNotEqual(None, delta0)
135
134
class TestFindUnmerged(tests.TestCaseWithTransport):
136
135
 
137
136
    def assertUnmerged(self, local, remote, local_branch, remote_branch,
138
 
                       restrict):
 
137
            restrict='all', include_merged=False, backward=False,
 
138
            local_revid_range=None, remote_revid_range=None):
139
139
        """Check the output of find_unmerged_mainline_revisions"""
140
140
        local_extra, remote_extra = missing.find_unmerged(
141
 
                                        local_branch, remote_branch, restrict)
 
141
            local_branch, remote_branch, restrict,
 
142
            include_merged=include_merged, backward=backward,
 
143
            local_revid_range=local_revid_range,
 
144
            remote_revid_range=remote_revid_range)
142
145
        self.assertEqual(local, local_extra)
143
146
        self.assertEqual(remote, remote_extra)
144
147
 
147
150
        rev1 = tree.commit('one')
148
151
        tree.lock_read()
149
152
        self.addCleanup(tree.unlock)
150
 
        self.assertUnmerged([], [], tree.branch, tree.branch, 'all')
 
153
        self.assertUnmerged([], [], tree.branch, tree.branch)
 
154
        self.assertUnmerged([], [], tree.branch, tree.branch,
 
155
            local_revid_range=(rev1, rev1))
151
156
 
152
157
    def test_one_ahead(self):
153
158
        tree = self.make_branch_and_tree('tree')
154
159
        rev1 = tree.commit('one')
155
160
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
156
161
        rev2 = tree2.commit('two')
157
 
        tree.lock_read()
158
 
        self.addCleanup(tree.unlock)
159
 
        tree2.lock_read()
160
 
        self.addCleanup(tree2.unlock)
161
 
        self.assertUnmerged([], [(2, rev2)], tree.branch, tree2.branch, 'all')
162
 
        self.assertUnmerged([(2, rev2)], [], tree2.branch, tree.branch, 'all')
 
162
        self.assertUnmerged([], [('2', rev2)], tree.branch, tree2.branch)
 
163
        self.assertUnmerged([('2', rev2)], [], tree2.branch, tree.branch)
163
164
 
164
165
    def test_restrict(self):
165
166
        tree = self.make_branch_and_tree('tree')
166
167
        rev1 = tree.commit('one')
167
168
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
168
169
        rev2 = tree2.commit('two')
169
 
        tree.lock_read()
170
 
        self.addCleanup(tree.unlock)
171
 
        tree2.lock_read()
172
 
        self.addCleanup(tree2.unlock)
173
 
        self.assertUnmerged([], [(2, rev2)], tree.branch, tree2.branch, 'all')
 
170
        self.assertUnmerged([], [('2', rev2)], tree.branch, tree2.branch)
174
171
        self.assertUnmerged([], None, tree.branch, tree2.branch, 'local')
175
 
        self.assertUnmerged(None, [(2, rev2)], tree.branch, tree2.branch,
 
172
        self.assertUnmerged(None, [('2', rev2)], tree.branch, tree2.branch,
176
173
                                               'remote')
177
174
 
178
175
    def test_merged(self):
184
181
        tree.merge_from_branch(tree2.branch)
185
182
        rev4 = tree.commit('four')
186
183
 
187
 
        tree.lock_read()
188
 
        self.addCleanup(tree.unlock)
189
 
        tree2.lock_read()
190
 
        self.addCleanup(tree2.unlock)
191
 
 
192
 
        self.assertUnmerged([(2, rev4)], [], tree.branch, tree2.branch, 'all')
 
184
        self.assertUnmerged([('2', rev4)], [], tree.branch, tree2.branch)
 
185
        self.assertUnmerged([('2', rev4)], [], tree.branch, tree2.branch,
 
186
            local_revid_range=(rev4, rev4))
 
187
        self.assertUnmerged([], [], tree.branch, tree2.branch,
 
188
            local_revid_range=(rev1, rev1))
 
189
 
 
190
    def test_include_merged(self):
 
191
        tree = self.make_branch_and_tree('tree')
 
192
        rev1 = tree.commit('one', rev_id='rev1')
 
193
 
 
194
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
195
        rev2 = tree2.commit('two', rev_id='rev2')
 
196
        rev3 = tree2.commit('three', rev_id='rev3')
 
197
 
 
198
        tree3 = tree2.bzrdir.sprout('tree3').open_workingtree()
 
199
        rev4 = tree3.commit('four', rev_id='rev4')
 
200
        rev5 = tree3.commit('five', rev_id='rev5')
 
201
 
 
202
        tree2.merge_from_branch(tree3.branch)
 
203
        rev6 = tree2.commit('six', rev_id='rev6')
 
204
 
 
205
        self.assertUnmerged([], [('2', 'rev2', 0), ('3', 'rev3', 0),
 
206
                                 ('4', 'rev6', 0),
 
207
                                 ('3.1.1', 'rev4', 1), ('3.1.2', 'rev5', 1),
 
208
                                 ],
 
209
                            tree.branch, tree2.branch,
 
210
                            include_merged=True)
 
211
 
 
212
        self.assertUnmerged([], [('4', 'rev6', 0),
 
213
                                 ('3.1.2', 'rev5', 1), ('3.1.1', 'rev4', 1),
 
214
                                 ('3', 'rev3', 0), ('2', 'rev2', 0),
 
215
                                 ],
 
216
                            tree.branch, tree2.branch,
 
217
                            include_merged=True,
 
218
                            backward=True)
 
219
 
 
220
        self.assertUnmerged([], [('4', 'rev6', 0)],
 
221
            tree.branch, tree2.branch,
 
222
            include_merged=True, remote_revid_range=(rev6, rev6))
 
223
 
 
224
        self.assertUnmerged([], [('3', 'rev3', 0), ('3.1.1', 'rev4', 1)],
 
225
                    tree.branch, tree2.branch,
 
226
                    include_merged=True, remote_revid_range=(rev3, rev4))
 
227
 
 
228
        self.assertUnmerged([], [('4', 'rev6', 0), ('3.1.2', 'rev5', 1)],
 
229
                    tree.branch, tree2.branch,
 
230
                    include_merged=True, remote_revid_range=(rev5, rev6))
 
231
 
 
232
    def test_revision_range(self):
 
233
        local = self.make_branch_and_tree('local')
 
234
        lrevid1 = local.commit('one')
 
235
        remote = local.bzrdir.sprout('remote').open_workingtree()
 
236
        rrevid2 = remote.commit('two')
 
237
        rrevid3 = remote.commit('three')
 
238
        rrevid4 = remote.commit('four')
 
239
        lrevid2 = local.commit('two')
 
240
        lrevid3 = local.commit('three')
 
241
        lrevid4 = local.commit('four')
 
242
        local_extra = [('2', lrevid2), ('3', lrevid3), ('4', lrevid4)]
 
243
        remote_extra = [('2', rrevid2), ('3', rrevid3), ('4', rrevid4)]
 
244
 
 
245
        # control
 
246
        self.assertUnmerged(local_extra, remote_extra,
 
247
            local.branch, remote.branch)
 
248
        self.assertUnmerged(local_extra, remote_extra,
 
249
            local.branch, remote.branch, local_revid_range=(None, None),
 
250
            remote_revid_range=(None, None))
 
251
 
 
252
        # exclude local revisions
 
253
        self.assertUnmerged([('2', lrevid2)], remote_extra,
 
254
            local.branch, remote.branch, local_revid_range=(lrevid2, lrevid2))
 
255
        self.assertUnmerged([('2', lrevid2), ('3', lrevid3)], remote_extra,
 
256
            local.branch, remote.branch, local_revid_range=(lrevid2, lrevid3))
 
257
        self.assertUnmerged([('2', lrevid2), ('3', lrevid3)], None,
 
258
            local.branch, remote.branch, 'local',
 
259
            local_revid_range=(lrevid2, lrevid3))
 
260
 
 
261
        # exclude remote revisions
 
262
        self.assertUnmerged(local_extra, [('2', rrevid2)],
 
263
            local.branch, remote.branch, remote_revid_range=(None, rrevid2))
 
264
        self.assertUnmerged(local_extra, [('2', rrevid2)],
 
265
            local.branch, remote.branch, remote_revid_range=(lrevid1, rrevid2))
 
266
        self.assertUnmerged(local_extra, [('2', rrevid2)],
 
267
            local.branch, remote.branch, remote_revid_range=(rrevid2, rrevid2))
 
268
        self.assertUnmerged(local_extra, [('2', rrevid2), ('3', rrevid3)],
 
269
            local.branch, remote.branch, remote_revid_range=(None, rrevid3))
 
270
        self.assertUnmerged(local_extra, [('2', rrevid2), ('3', rrevid3)],
 
271
            local.branch, remote.branch, remote_revid_range=(rrevid2, rrevid3))
 
272
        self.assertUnmerged(local_extra, [('3', rrevid3)],
 
273
            local.branch, remote.branch, remote_revid_range=(rrevid3, rrevid3))
 
274
        self.assertUnmerged(None, [('2', rrevid2), ('3', rrevid3)],
 
275
            local.branch, remote.branch, 'remote',
 
276
            remote_revid_range=(rrevid2, rrevid3))
 
277
 
 
278
        # exclude local and remote revisions
 
279
        self.assertUnmerged([('3', lrevid3)], [('3', rrevid3)],
 
280
            local.branch, remote.branch, local_revid_range=(lrevid3, lrevid3),
 
281
            remote_revid_range=(rrevid3, rrevid3))