/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 breezy/tests/test_missing.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 14:45:27 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708144527-codhlvdcdg9y0nji
Fix a bunch of merge tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/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
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
import os
18
 
 
19
 
 
20
 
from bzrlib import (
 
17
from .. import (
21
18
    missing,
22
19
    tests,
23
20
    )
24
 
from bzrlib.missing import (
 
21
from ..missing import (
25
22
    iter_log_revisions,
26
23
    )
27
 
from bzrlib.tests import TestCaseWithTransport
28
 
from bzrlib.workingtree import WorkingTree
 
24
from . import TestCaseWithTransport
29
25
 
30
26
 
31
27
class TestMissing(TestCaseWithTransport):
44
40
        merger_tree = self.make_branch_and_tree('merger')
45
41
        merger = merger_tree.branch
46
42
        self.assertUnmerged(([], []), original, puller)
47
 
        original_tree.commit('a', rev_id='a')
48
 
        self.assertUnmerged(([('1', 'a')], []), original, puller)
 
43
        original_tree.commit('a', rev_id=b'a')
 
44
        self.assertUnmerged(([('1', 'a', 0)], []), original, puller)
49
45
        puller_tree.pull(original)
50
46
        self.assertUnmerged(([], []), original, puller)
51
47
        merger_tree.pull(original)
52
 
        original_tree.commit('b', rev_id='b')
53
 
        original_tree.commit('c', rev_id='c')
54
 
        self.assertUnmerged(([('2', 'b'), ('3', 'c')], []),
 
48
        original_tree.commit('b', rev_id=b'b')
 
49
        original_tree.commit('c', rev_id=b'c')
 
50
        self.assertUnmerged(([('2', 'b', 0), ('3', 'c', 0)], []),
55
51
                            original, puller)
56
 
        self.assertUnmerged(([('3', 'c'), ('2', 'b')], []),
 
52
        self.assertUnmerged(([('3', 'c', 0), ('2', 'b', 0)], []),
57
53
                            original, puller, backward=True)
58
54
 
59
55
        puller_tree.pull(original)
60
56
        self.assertUnmerged(([], []), original, puller)
61
 
        self.assertUnmerged(([('2', 'b'), ('3', 'c')], []),
 
57
        self.assertUnmerged(([('2', 'b', 0), ('3', 'c', 0)], []),
62
58
                            original, merger)
63
59
        merger_tree.merge_from_branch(original)
64
 
        self.assertUnmerged(([('2', 'b'), ('3', 'c')], []),
 
60
        self.assertUnmerged(([('2', 'b', 0), ('3', 'c', 0)], []),
65
61
                            original, merger)
66
 
        merger_tree.commit('d', rev_id='d')
67
 
        self.assertUnmerged(([], [('2', 'd')]), original, merger)
 
62
        merger_tree.commit('d', rev_id=b'd')
 
63
        self.assertUnmerged(([], [('2', 'd', 0)]), original, merger)
68
64
 
69
65
    def test_iter_log_revisions(self):
70
66
        base_tree = self.make_branch_and_tree('base')
71
67
        self.build_tree(['base/a'])
72
 
        base_tree.add(['a'], ['a-id'])
73
 
        base_tree.commit('add a', rev_id='b-1')
 
68
        base_tree.add(['a'], [b'a-id'])
 
69
        base_tree.commit('add a', rev_id=b'b-1')
74
70
 
75
 
        child_tree = base_tree.bzrdir.sprout('child').open_workingtree()
 
71
        child_tree = base_tree.controldir.sprout('child').open_workingtree()
76
72
 
77
73
        self.build_tree(['child/b'])
78
 
        child_tree.add(['b'], ['b-id'])
79
 
        child_tree.commit('adding b', rev_id='c-2')
 
74
        child_tree.add(['b'], [b'b-id'])
 
75
        child_tree.commit('adding b', rev_id=b'c-2')
80
76
 
81
77
        child_tree.remove(['a'])
82
 
        child_tree.commit('removing a', rev_id='c-3')
 
78
        child_tree.commit('removing a', rev_id=b'c-3')
83
79
 
84
 
        self.build_tree_contents([('child/b', 'new contents for b\n')])
85
 
        child_tree.commit('modifying b', rev_id='c-4')
 
80
        self.build_tree_contents([('child/b', b'new contents for b\n')])
 
81
        child_tree.commit('modifying b', rev_id=b'c-4')
86
82
 
87
83
        child_tree.rename_one('b', 'c')
88
 
        child_tree.commit('rename b=>c', rev_id='c-5')
 
84
        child_tree.commit('rename b=>c', rev_id=b'c-5')
89
85
 
90
86
        base_extra, child_extra = missing.find_unmerged(base_tree.branch,
91
87
                                                        child_tree.branch)
99
95
                            verbose=True))
100
96
        self.assertEqual(4, len(results))
101
97
 
102
 
        r0,r1,r2,r3 = results
 
98
        r0, r1, r2, r3 = results
103
99
 
104
100
        self.assertEqual([('2', 'c-2'), ('3', 'c-3'),
105
101
                          ('4', 'c-4'), ('5', 'c-5'),],
107
103
 
108
104
        delta0 = r0.delta
109
105
        self.assertNotEqual(None, delta0)
110
 
        self.assertEqual([('b', 'b-id', 'file')], delta0.added)
 
106
        self.assertEqual([('b', b'b-id', 'file')], delta0.added)
111
107
        self.assertEqual([], delta0.removed)
112
108
        self.assertEqual([], delta0.renamed)
113
109
        self.assertEqual([], delta0.modified)
115
111
        delta1 = r1.delta
116
112
        self.assertNotEqual(None, delta1)
117
113
        self.assertEqual([], delta1.added)
118
 
        self.assertEqual([('a', 'a-id', 'file')], delta1.removed)
 
114
        self.assertEqual([('a', b'a-id', 'file')], delta1.removed)
119
115
        self.assertEqual([], delta1.renamed)
120
116
        self.assertEqual([], delta1.modified)
121
117
 
124
120
        self.assertEqual([], delta2.added)
125
121
        self.assertEqual([], delta2.removed)
126
122
        self.assertEqual([], delta2.renamed)
127
 
        self.assertEqual([('b', 'b-id', 'file', True, False)], delta2.modified)
 
123
        self.assertEqual([('b', b'b-id', 'file', True, False)], delta2.modified)
128
124
 
129
125
        delta3 = r3.delta
130
126
        self.assertNotEqual(None, delta3)
131
127
        self.assertEqual([], delta3.added)
132
128
        self.assertEqual([], delta3.removed)
133
 
        self.assertEqual([('b', 'c', 'b-id', 'file', False, False)],
 
129
        self.assertEqual([('b', 'c', b'b-id', 'file', False, False)],
134
130
                         delta3.renamed)
135
131
        self.assertEqual([], delta3.modified)
136
132
 
138
134
class TestFindUnmerged(tests.TestCaseWithTransport):
139
135
 
140
136
    def assertUnmerged(self, local, remote, local_branch, remote_branch,
141
 
            restrict='all', include_merges=False, backward=False,
 
137
            restrict='all', include_merged=False, backward=False,
142
138
            local_revid_range=None, remote_revid_range=None):
143
139
        """Check the output of find_unmerged_mainline_revisions"""
144
140
        local_extra, remote_extra = missing.find_unmerged(
145
141
            local_branch, remote_branch, restrict,
146
 
            include_merges=include_merges, backward=backward,
 
142
            include_merged=include_merged, backward=backward,
147
143
            local_revid_range=local_revid_range,
148
144
            remote_revid_range=remote_revid_range)
149
145
        self.assertEqual(local, local_extra)
161
157
    def test_one_ahead(self):
162
158
        tree = self.make_branch_and_tree('tree')
163
159
        rev1 = tree.commit('one')
164
 
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
160
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
165
161
        rev2 = tree2.commit('two')
166
 
        self.assertUnmerged([], [('2', rev2)], tree.branch, tree2.branch)
167
 
        self.assertUnmerged([('2', rev2)], [], tree2.branch, tree.branch)
 
162
        self.assertUnmerged([], [('2', rev2, 0)], tree.branch, tree2.branch)
 
163
        self.assertUnmerged([('2', rev2, 0)], [], tree2.branch, tree.branch)
168
164
 
169
165
    def test_restrict(self):
170
166
        tree = self.make_branch_and_tree('tree')
171
167
        rev1 = tree.commit('one')
172
 
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
168
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
173
169
        rev2 = tree2.commit('two')
174
 
        self.assertUnmerged([], [('2', rev2)], tree.branch, tree2.branch)
 
170
        self.assertUnmerged([], [('2', rev2, 0)], tree.branch, tree2.branch)
175
171
        self.assertUnmerged([], None, tree.branch, tree2.branch, 'local')
176
 
        self.assertUnmerged(None, [('2', rev2)], tree.branch, tree2.branch,
 
172
        self.assertUnmerged(None, [('2', rev2, 0)], tree.branch, tree2.branch,
177
173
                                               'remote')
178
174
 
179
175
    def test_merged(self):
180
176
        tree = self.make_branch_and_tree('tree')
181
177
        rev1 = tree.commit('one')
182
 
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
178
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
183
179
        rev2 = tree2.commit('two')
184
180
        rev3 = tree2.commit('three')
185
181
        tree.merge_from_branch(tree2.branch)
186
182
        rev4 = tree.commit('four')
187
183
 
188
 
        self.assertUnmerged([('2', rev4)], [], tree.branch, tree2.branch)
189
 
        self.assertUnmerged([('2', rev4)], [], tree.branch, tree2.branch,
 
184
        self.assertUnmerged([('2', rev4, 0)], [], tree.branch, tree2.branch)
 
185
        self.assertUnmerged([('2', rev4, 0)], [], tree.branch, tree2.branch,
190
186
            local_revid_range=(rev4, rev4))
191
187
        self.assertUnmerged([], [], tree.branch, tree2.branch,
192
188
            local_revid_range=(rev1, rev1))
193
189
 
194
 
    def test_include_merges(self):
 
190
    def test_include_merged(self):
195
191
        tree = self.make_branch_and_tree('tree')
196
 
        rev1 = tree.commit('one', rev_id='rev1')
197
 
 
198
 
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
199
 
        rev2 = tree2.commit('two', rev_id='rev2')
200
 
        rev3 = tree2.commit('three', rev_id='rev3')
201
 
 
202
 
        tree3 = tree2.bzrdir.sprout('tree3').open_workingtree()
203
 
        rev4 = tree3.commit('four', rev_id='rev4')
204
 
        rev5 = tree3.commit('five', rev_id='rev5')
 
192
        rev1 = tree.commit('one', rev_id=b'rev1')
 
193
 
 
194
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
 
195
        rev2 = tree2.commit('two', rev_id=b'rev2')
 
196
        rev3 = tree2.commit('three', rev_id=b'rev3')
 
197
 
 
198
        tree3 = tree2.controldir.sprout('tree3').open_workingtree()
 
199
        rev4 = tree3.commit('four', rev_id=b'rev4')
 
200
        rev5 = tree3.commit('five', rev_id=b'rev5')
205
201
 
206
202
        tree2.merge_from_branch(tree3.branch)
207
 
        rev6 = tree2.commit('six', rev_id='rev6')
 
203
        rev6 = tree2.commit('six', rev_id=b'rev6')
208
204
 
209
205
        self.assertUnmerged([], [('2', 'rev2', 0), ('3', 'rev3', 0),
210
206
                                 ('4', 'rev6', 0),
211
207
                                 ('3.1.1', 'rev4', 1), ('3.1.2', 'rev5', 1),
212
208
                                 ],
213
209
                            tree.branch, tree2.branch,
214
 
                            include_merges=True)
 
210
                            include_merged=True)
215
211
 
216
212
        self.assertUnmerged([], [('4', 'rev6', 0),
217
213
                                 ('3.1.2', 'rev5', 1), ('3.1.1', 'rev4', 1),
218
214
                                 ('3', 'rev3', 0), ('2', 'rev2', 0),
219
215
                                 ],
220
216
                            tree.branch, tree2.branch,
221
 
                            include_merges=True,
 
217
                            include_merged=True,
222
218
                            backward=True)
223
219
 
224
220
        self.assertUnmerged([], [('4', 'rev6', 0)],
225
221
            tree.branch, tree2.branch,
226
 
            include_merges=True, remote_revid_range=(rev6, rev6))
 
222
            include_merged=True, remote_revid_range=(rev6, rev6))
227
223
 
228
224
        self.assertUnmerged([], [('3', 'rev3', 0), ('3.1.1', 'rev4', 1)],
229
225
                    tree.branch, tree2.branch,
230
 
                    include_merges=True, remote_revid_range=(rev3, rev4))
 
226
                    include_merged=True, remote_revid_range=(rev3, rev4))
231
227
 
232
228
        self.assertUnmerged([], [('4', 'rev6', 0), ('3.1.2', 'rev5', 1)],
233
229
                    tree.branch, tree2.branch,
234
 
                    include_merges=True, remote_revid_range=(rev5, rev6))
 
230
                    include_merged=True, remote_revid_range=(rev5, rev6))
235
231
 
236
232
    def test_revision_range(self):
237
233
        local = self.make_branch_and_tree('local')
238
234
        lrevid1 = local.commit('one')
239
 
        remote = local.bzrdir.sprout('remote').open_workingtree()
 
235
        remote = local.controldir.sprout('remote').open_workingtree()
240
236
        rrevid2 = remote.commit('two')
241
237
        rrevid3 = remote.commit('three')
242
238
        rrevid4 = remote.commit('four')
243
239
        lrevid2 = local.commit('two')
244
240
        lrevid3 = local.commit('three')
245
241
        lrevid4 = local.commit('four')
246
 
        local_extra = [('2', lrevid2), ('3', lrevid3), ('4', lrevid4)]
247
 
        remote_extra = [('2', rrevid2), ('3', rrevid3), ('4', rrevid4)]
 
242
        local_extra = [('2', lrevid2, 0), ('3', lrevid3, 0), ('4', lrevid4, 0)]
 
243
        remote_extra = [('2', rrevid2, 0), ('3', rrevid3, 0), ('4', rrevid4, 0)]
248
244
 
249
245
        # control
250
246
        self.assertUnmerged(local_extra, remote_extra,
254
250
            remote_revid_range=(None, None))
255
251
 
256
252
        # exclude local revisions
257
 
        self.assertUnmerged([('2', lrevid2)], remote_extra,
 
253
        self.assertUnmerged([('2', lrevid2, 0)], remote_extra,
258
254
            local.branch, remote.branch, local_revid_range=(lrevid2, lrevid2))
259
 
        self.assertUnmerged([('2', lrevid2), ('3', lrevid3)], remote_extra,
 
255
        self.assertUnmerged([('2', lrevid2, 0), ('3', lrevid3, 0)], remote_extra,
260
256
            local.branch, remote.branch, local_revid_range=(lrevid2, lrevid3))
261
 
        self.assertUnmerged([('2', lrevid2), ('3', lrevid3)], None,
 
257
        self.assertUnmerged([('2', lrevid2, 0), ('3', lrevid3, 0)], None,
262
258
            local.branch, remote.branch, 'local',
263
259
            local_revid_range=(lrevid2, lrevid3))
264
260
 
265
261
        # exclude remote revisions
266
 
        self.assertUnmerged(local_extra, [('2', rrevid2)],
 
262
        self.assertUnmerged(local_extra, [('2', rrevid2, 0)],
267
263
            local.branch, remote.branch, remote_revid_range=(None, rrevid2))
268
 
        self.assertUnmerged(local_extra, [('2', rrevid2)],
 
264
        self.assertUnmerged(local_extra, [('2', rrevid2, 0)],
269
265
            local.branch, remote.branch, remote_revid_range=(lrevid1, rrevid2))
270
 
        self.assertUnmerged(local_extra, [('2', rrevid2)],
 
266
        self.assertUnmerged(local_extra, [('2', rrevid2, 0)],
271
267
            local.branch, remote.branch, remote_revid_range=(rrevid2, rrevid2))
272
 
        self.assertUnmerged(local_extra, [('2', rrevid2), ('3', rrevid3)],
 
268
        self.assertUnmerged(local_extra, [('2', rrevid2, 0), ('3', rrevid3, 0)],
273
269
            local.branch, remote.branch, remote_revid_range=(None, rrevid3))
274
 
        self.assertUnmerged(local_extra, [('2', rrevid2), ('3', rrevid3)],
 
270
        self.assertUnmerged(local_extra, [('2', rrevid2, 0), ('3', rrevid3, 0)],
275
271
            local.branch, remote.branch, remote_revid_range=(rrevid2, rrevid3))
276
 
        self.assertUnmerged(local_extra, [('3', rrevid3)],
 
272
        self.assertUnmerged(local_extra, [('3', rrevid3, 0)],
277
273
            local.branch, remote.branch, remote_revid_range=(rrevid3, rrevid3))
278
 
        self.assertUnmerged(None, [('2', rrevid2), ('3', rrevid3)],
 
274
        self.assertUnmerged(None, [('2', rrevid2, 0), ('3', rrevid3, 0)],
279
275
            local.branch, remote.branch, 'remote',
280
276
            remote_revid_range=(rrevid2, rrevid3))
281
277
 
282
278
        # exclude local and remote revisions
283
 
        self.assertUnmerged([('3', lrevid3)], [('3', rrevid3)],
 
279
        self.assertUnmerged([('3', lrevid3, 0)], [('3', rrevid3, 0)],
284
280
            local.branch, remote.branch, local_revid_range=(lrevid3, lrevid3),
285
281
            remote_revid_range=(rrevid3, rrevid3))