/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_missing.py

  • Committer: Marius Kruger
  • Date: 2010-07-10 21:28:56 UTC
  • mto: (5384.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5385.
  • Revision ID: marius.kruger@enerweb.co.za-20100710212856-uq4ji3go0u5se7hx
* Update documentation
* add NEWS

Show diffs side-by-side

added added

removed removed

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