← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_missing.py

  • Committer: Jelmer Vernooij
  • Date: 2010-12-20 11:57:14 UTC
  • mto: This revision was merged to the branch mainline in revision 5577.
  • Revision ID: jelmer@samba.org-20101220115714-2ru3hfappjweeg7q
Don't use no-plugins.

Show diffs side-by-side

added added

removed removed

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