← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

Late bind to PatienceSequenceMatcher to allow plugin to override.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
1
 
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
2
 
#
3
 
# This program is free software; you can redistribute it and/or modify
4
 
# it under the terms of the GNU General Public License as published by
5
 
# the Free Software Foundation; either version 2 of the License, or
6
 
# (at your option) any later version.
7
 
#
8
 
# This program is distributed in the hope that it will be useful,
9
 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
 
# GNU General Public License for more details.
12
 
#
13
 
# You should have received a copy of the GNU General Public License
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
1
import os
18
2
from StringIO import StringIO
19
3
 
20
 
from bzrlib import (
21
 
    conflicts,
22
 
    errors,
23
 
    knit,
24
 
    merge as _mod_merge,
25
 
    option,
26
 
    progress,
27
 
    transform,
28
 
    versionedfile,
29
 
    )
30
4
from bzrlib.branch import Branch
31
 
from bzrlib.conflicts import ConflictList, TextConflict
 
5
from bzrlib.builtins import merge
 
6
from bzrlib.commit import commit
32
7
from bzrlib.errors import UnrelatedBranches, NoCommits, BzrCommandError
33
 
from bzrlib.merge import transform_tree, merge_inner, _PlanMerge
34
 
from bzrlib.osutils import pathjoin, file_kind
35
 
from bzrlib.tests import TestCaseWithTransport, TestCaseWithMemoryTransport
 
8
from bzrlib.merge import transform_tree, merge_inner
 
9
from bzrlib.osutils import pathjoin
 
10
from bzrlib.revision import common_ancestor
 
11
from bzrlib.tests import TestCaseWithTransport
36
12
from bzrlib.trace import (enable_test_log, disable_test_log)
37
13
from bzrlib.workingtree import WorkingTree
38
14
 
42
18
 
43
19
    def test_pending(self):
44
20
        wt = self.make_branch_and_tree('.')
45
 
        rev_a = wt.commit("lala!")
46
 
        self.assertEqual([rev_a], wt.get_parent_ids())
47
 
        self.assertRaises(errors.PointlessMerge, wt.merge_from_branch,
48
 
                          wt.branch)
49
 
        self.assertEqual([rev_a], wt.get_parent_ids())
50
 
        return wt
 
21
        wt.commit("lala!")
 
22
        self.assertEquals(len(wt.pending_merges()), 0)
 
23
        merge([u'.', -1], [None, None])
 
24
        self.assertEquals(len(wt.pending_merges()), 0)
51
25
 
52
26
    def test_undo(self):
53
27
        wt = self.make_branch_and_tree('.')
54
28
        wt.commit("lala!")
55
29
        wt.commit("haha!")
56
30
        wt.commit("blabla!")
57
 
        wt.merge_from_branch(wt.branch, wt.branch.get_rev_id(2),
58
 
                             wt.branch.get_rev_id(1))
 
31
        merge([u'.', 2], [u'.', 1])
59
32
 
60
33
    def test_nocommits(self):
61
 
        wt = self.test_pending()
 
34
        self.test_pending()
62
35
        wt2 = self.make_branch_and_tree('branch2')
63
 
        self.assertRaises(NoCommits, wt.merge_from_branch, wt2.branch)
64
 
        return wt, wt2
 
36
        self.assertRaises(NoCommits, merge, ['branch2', -1], 
 
37
                          [None, None])
 
38
        return wt2
65
39
 
66
40
    def test_unrelated(self):
67
 
        wt, wt2 = self.test_nocommits()
 
41
        wt2 = self.test_nocommits()
68
42
        wt2.commit("blah")
69
 
        self.assertRaises(UnrelatedBranches, wt.merge_from_branch, wt2.branch)
 
43
        self.assertRaises(UnrelatedBranches, merge, ['branch2', -1], 
 
44
                          [None, None])
70
45
        return wt2
71
46
 
72
 
    def test_merge_one_file(self):
73
 
        """Do a partial merge of a tree which should not affect tree parents."""
 
47
    def test_merge_one(self):
74
48
        wt1 = self.make_branch_and_tree('branch1')
75
 
        tip = wt1.commit('empty commit')
 
49
        wt1.commit('empty commit')
76
50
        wt2 = self.make_branch_and_tree('branch2')
77
51
        wt2.pull(wt1.branch)
78
52
        file('branch1/foo', 'wb').write('foo')
81
55
        wt1.add('bar')
82
56
        wt1.commit('add foobar')
83
57
        os.chdir('branch2')
84
 
        self.run_bzr('merge ../branch1/baz', retcode=3)
85
 
        self.run_bzr('merge ../branch1/foo')
 
58
        self.run_bzr('merge', '../branch1/baz', retcode=3)
 
59
        self.run_bzr('merge', '../branch1/foo')
86
60
        self.failUnlessExists('foo')
87
61
        self.failIfExists('bar')
88
 
        wt2 = WorkingTree.open('.') # opens branch2
89
 
        self.assertEqual([tip], wt2.get_parent_ids())
90
 
        
 
62
        wt2 = WorkingTree.open_containing('branch2')[0]
 
63
        self.assertEqual(wt2.pending_merges(), [])
 
64
 
91
65
    def test_pending_with_null(self):
92
 
        """When base is forced to revno 0, parent_ids are set"""
 
66
        """When base is forced to revno 0, pending_merges is set"""
93
67
        wt2 = self.test_unrelated()
94
68
        wt1 = WorkingTree.open('.')
95
69
        br1 = wt1.branch
96
70
        br1.fetch(wt2.branch)
97
71
        # merge all of branch 2 into branch 1 even though they 
98
72
        # are not related.
99
 
        wt1.merge_from_branch(wt2.branch, wt2.last_revision(), 'null:')
100
 
        self.assertEqual([br1.last_revision(), wt2.branch.last_revision()],
101
 
            wt1.get_parent_ids())
 
73
        self.assertRaises(BzrCommandError, merge, ['branch2', -1], 
 
74
                          ['branch2', 0], reprocess=True, show_base=True)
 
75
        merge(['branch2', -1], ['branch2', 0], reprocess=True)
 
76
        self.assertEquals(len(wt1.pending_merges()), 1)
102
77
        return (wt1, wt2.branch)
103
78
 
104
79
    def test_two_roots(self):
105
80
        """Merge base is sane when two unrelated branches are merged"""
106
81
        wt1, br2 = self.test_pending_with_null()
107
82
        wt1.commit("blah")
108
 
        wt1.lock_read()
109
 
        try:
110
 
            last = wt1.branch.last_revision()
111
 
            last2 = br2.last_revision()
112
 
            graph = wt1.branch.repository.get_graph()
113
 
            self.assertEqual(last2, graph.find_unique_lca(last, last2))
114
 
        finally:
115
 
            wt1.unlock()
 
83
        last = wt1.branch.last_revision()
 
84
        self.assertEquals(common_ancestor(last, last, wt1.branch.repository), last)
116
85
 
117
86
    def test_create_rename(self):
118
87
        """Rename an inventory entry while creating the file"""
139
108
        transform_tree(tree, tree.branch.basis_tree())
140
109
 
141
110
    def test_ignore_zero_merge_inner(self):
142
 
        # Test that merge_inner's ignore zero parameter is effective
 
111
        # Test that merge_inner's ignore zero paramter is effective
143
112
        tree_a =self.make_branch_and_tree('a')
144
113
        tree_a.commit(message="hello")
145
114
        dir_b = tree_a.bzrdir.sprout('b')
146
115
        tree_b = dir_b.open_workingtree()
147
 
        tree_b.lock_write()
148
 
        self.addCleanup(tree_b.unlock)
149
116
        tree_a.commit(message="hello again")
150
117
        log = StringIO()
151
118
        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(), 
152
119
                    this_tree=tree_b, ignore_zero=True)
153
 
        log = self._get_log(keep_log_file=True)
 
120
        log = self._get_log()
154
121
        self.failUnless('All changes applied successfully.\n' not in log)
155
 
        tree_b.revert()
 
122
        tree_b.revert([])
156
123
        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(), 
157
124
                    this_tree=tree_b, ignore_zero=False)
158
 
        log = self._get_log(keep_log_file=True)
 
125
        log = self._get_log()
159
126
        self.failUnless('All changes applied successfully.\n' in log)
160
 
 
161
 
    def test_merge_inner_conflicts(self):
162
 
        tree_a = self.make_branch_and_tree('a')
163
 
        tree_a.set_conflicts(ConflictList([TextConflict('patha')]))
164
 
        merge_inner(tree_a.branch, tree_a, tree_a, this_tree=tree_a)
165
 
        self.assertEqual(1, len(tree_a.conflicts()))
166
 
 
167
 
    def test_rmdir_conflict(self):
168
 
        tree_a = self.make_branch_and_tree('a')
169
 
        self.build_tree(['a/b/'])
170
 
        tree_a.add('b', 'b-id')
171
 
        tree_a.commit('added b')
172
 
        # basis_tree() is only guaranteed to be valid as long as it is actually
173
 
        # the basis tree. This mutates the tree after grabbing basis, so go to
174
 
        # the repository.
175
 
        base_tree = tree_a.branch.repository.revision_tree(tree_a.last_revision())
176
 
        tree_z = tree_a.bzrdir.sprout('z').open_workingtree()
177
 
        self.build_tree(['a/b/c'])
178
 
        tree_a.add('b/c')
179
 
        tree_a.commit('added c')
180
 
        os.rmdir('z/b')
181
 
        tree_z.commit('removed b')
182
 
        merge_inner(tree_z.branch, tree_a, base_tree, this_tree=tree_z)
183
 
        self.assertEqual([
184
 
            conflicts.MissingParent('Created directory', 'b', 'b-id'),
185
 
            conflicts.UnversionedParent('Versioned directory', 'b', 'b-id')],
186
 
            tree_z.conflicts())
187
 
        merge_inner(tree_a.branch, tree_z.basis_tree(), base_tree,
188
 
                    this_tree=tree_a)
189
 
        self.assertEqual([
190
 
            conflicts.DeletingParent('Not deleting', 'b', 'b-id'),
191
 
            conflicts.UnversionedParent('Versioned directory', 'b', 'b-id')],
192
 
            tree_a.conflicts())
193
 
 
194
 
    def test_nested_merge(self):
195
 
        tree = self.make_branch_and_tree('tree',
196
 
            format='dirstate-with-subtree')
197
 
        sub_tree = self.make_branch_and_tree('tree/sub-tree',
198
 
            format='dirstate-with-subtree')
199
 
        sub_tree.set_root_id('sub-tree-root')
200
 
        self.build_tree_contents([('tree/sub-tree/file', 'text1')])
201
 
        sub_tree.add('file')
202
 
        sub_tree.commit('foo')
203
 
        tree.add_reference(sub_tree)
204
 
        tree.commit('set text to 1')
205
 
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
206
 
        # modify the file in the subtree
207
 
        self.build_tree_contents([('tree2/sub-tree/file', 'text2')])
208
 
        # and merge the changes from the diverged subtree into the containing
209
 
        # tree
210
 
        tree2.commit('changed file text')
211
 
        tree.merge_from_branch(tree2.branch)
212
 
        self.assertFileEqual('text2', 'tree/sub-tree/file')
213
 
 
214
 
    def test_merge_with_missing(self):
215
 
        tree_a = self.make_branch_and_tree('tree_a')
216
 
        self.build_tree_contents([('tree_a/file', 'content_1')])
217
 
        tree_a.add('file')
218
 
        tree_a.commit('commit base')
219
 
        # basis_tree() is only guaranteed to be valid as long as it is actually
220
 
        # the basis tree. This mutates the tree after grabbing basis, so go to
221
 
        # the repository.
222
 
        base_tree = tree_a.branch.repository.revision_tree(tree_a.last_revision())
223
 
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
224
 
        self.build_tree_contents([('tree_a/file', 'content_2')])
225
 
        tree_a.commit('commit other')
226
 
        other_tree = tree_a.basis_tree()
227
 
        os.unlink('tree_b/file')
228
 
        merge_inner(tree_b.branch, other_tree, base_tree, this_tree=tree_b)
229
 
 
230
 
    def test_merge_kind_change(self):
231
 
        tree_a = self.make_branch_and_tree('tree_a')
232
 
        self.build_tree_contents([('tree_a/file', 'content_1')])
233
 
        tree_a.add('file', 'file-id')
234
 
        tree_a.commit('added file')
235
 
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
236
 
        os.unlink('tree_a/file')
237
 
        self.build_tree(['tree_a/file/'])
238
 
        tree_a.commit('changed file to directory')
239
 
        tree_b.merge_from_branch(tree_a.branch)
240
 
        self.assertEqual('directory', file_kind('tree_b/file'))
241
 
        tree_b.revert()
242
 
        self.assertEqual('file', file_kind('tree_b/file'))
243
 
        self.build_tree_contents([('tree_b/file', 'content_2')])
244
 
        tree_b.commit('content change')
245
 
        tree_b.merge_from_branch(tree_a.branch)
246
 
        self.assertEqual(tree_b.conflicts(),
247
 
                         [conflicts.ContentsConflict('file',
248
 
                          file_id='file-id')])
249
 
    
250
 
    def test_merge_type_registry(self):
251
 
        merge_type_option = option.Option.OPTIONS['merge-type']
252
 
        self.assertFalse('merge4' in [x[0] for x in 
253
 
                        merge_type_option.iter_switches()])
254
 
        registry = _mod_merge.get_merge_type_registry()
255
 
        registry.register_lazy('merge4', 'bzrlib.merge', 'Merge4Merger',
256
 
                               'time-travelling merge')
257
 
        self.assertTrue('merge4' in [x[0] for x in 
258
 
                        merge_type_option.iter_switches()])
259
 
        registry.remove('merge4')
260
 
        self.assertFalse('merge4' in [x[0] for x in 
261
 
                        merge_type_option.iter_switches()])
262
 
 
263
 
    def test_merge_other_moves_we_deleted(self):
264
 
        tree_a = self.make_branch_and_tree('A')
265
 
        tree_a.lock_write()
266
 
        self.addCleanup(tree_a.unlock)
267
 
        self.build_tree(['A/a'])
268
 
        tree_a.add('a')
269
 
        tree_a.commit('1', rev_id='rev-1')
270
 
        tree_a.flush()
271
 
        tree_a.rename_one('a', 'b')
272
 
        tree_a.commit('2')
273
 
        bzrdir_b = tree_a.bzrdir.sprout('B', revision_id='rev-1')
274
 
        tree_b = bzrdir_b.open_workingtree()
275
 
        tree_b.lock_write()
276
 
        self.addCleanup(tree_b.unlock)
277
 
        os.unlink('B/a')
278
 
        tree_b.commit('3')
279
 
        try:
280
 
            tree_b.merge_from_branch(tree_a.branch)
281
 
        except AttributeError:
282
 
            self.fail('tried to join a path when name was None')
283
 
 
284
 
    def test_merge_uncommitted_otherbasis_ancestor_of_thisbasis(self):
285
 
        tree_a = self.make_branch_and_tree('a')
286
 
        self.build_tree(['a/file_1', 'a/file_2'])
287
 
        tree_a.add(['file_1'])
288
 
        tree_a.commit('commit 1')
289
 
        tree_a.add(['file_2'])
290
 
        tree_a.commit('commit 2')
291
 
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
292
 
        tree_b.rename_one('file_1', 'renamed')
293
 
        merger = _mod_merge.Merger.from_uncommitted(tree_a, tree_b,
294
 
                                                    progress.DummyProgress())
295
 
        merger.merge_type = _mod_merge.Merge3Merger
296
 
        merger.do_merge()
297
 
        self.assertEqual(tree_a.get_parent_ids(), [tree_b.last_revision()])
298
 
 
299
 
    def test_merge_uncommitted_otherbasis_ancestor_of_thisbasis_weave(self):
300
 
        tree_a = self.make_branch_and_tree('a')
301
 
        self.build_tree(['a/file_1', 'a/file_2'])
302
 
        tree_a.add(['file_1'])
303
 
        tree_a.commit('commit 1')
304
 
        tree_a.add(['file_2'])
305
 
        tree_a.commit('commit 2')
306
 
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
307
 
        tree_b.rename_one('file_1', 'renamed')
308
 
        merger = _mod_merge.Merger.from_uncommitted(tree_a, tree_b,
309
 
                                                    progress.DummyProgress())
310
 
        merger.merge_type = _mod_merge.WeaveMerger
311
 
        merger.do_merge()
312
 
        self.assertEqual(tree_a.get_parent_ids(), [tree_b.last_revision()])
313
 
 
314
 
    def prepare_cherrypick(self):
315
 
        """Prepare a pair of trees for cherrypicking tests.
316
 
 
317
 
        Both trees have a file, 'file'.
318
 
        rev1 sets content to 'a'.
319
 
        rev2b adds 'b'.
320
 
        rev3b adds 'c'.
321
 
        A full merge of rev2b and rev3b into this_tree would add both 'b' and
322
 
        'c'.  A successful cherrypick of rev2b-rev3b into this_tree will add
323
 
        'c', but not 'b'.
324
 
        """
325
 
        this_tree = self.make_branch_and_tree('this')
326
 
        self.build_tree_contents([('this/file', "a\n")])
327
 
        this_tree.add('file')
328
 
        this_tree.commit('rev1')
329
 
        other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
330
 
        self.build_tree_contents([('other/file', "a\nb\n")])
331
 
        other_tree.commit('rev2b', rev_id='rev2b')
332
 
        self.build_tree_contents([('other/file', "c\na\nb\n")])
333
 
        other_tree.commit('rev3b', rev_id='rev3b')
334
 
        this_tree.lock_write()
335
 
        self.addCleanup(this_tree.unlock)
336
 
        return this_tree, other_tree
337
 
 
338
 
    def test_weave_cherrypick(self):
339
 
        this_tree, other_tree = self.prepare_cherrypick()
340
 
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
341
 
            this_tree, 'rev3b', 'rev2b', other_tree.branch)
342
 
        merger.merge_type = _mod_merge.WeaveMerger
343
 
        merger.do_merge()
344
 
        self.assertFileEqual('c\na\n', 'this/file')
345
 
 
346
 
    def test_weave_cannot_reverse_cherrypick(self):
347
 
        this_tree, other_tree = self.prepare_cherrypick()
348
 
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
349
 
            this_tree, 'rev2b', 'rev3b', other_tree.branch)
350
 
        merger.merge_type = _mod_merge.WeaveMerger
351
 
        self.assertRaises(errors.CannotReverseCherrypick, merger.do_merge)
352
 
 
353
 
    def test_merge3_can_reverse_cherrypick(self):
354
 
        this_tree, other_tree = self.prepare_cherrypick()
355
 
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
356
 
            this_tree, 'rev2b', 'rev3b', other_tree.branch)
357
 
        merger.merge_type = _mod_merge.Merge3Merger
358
 
        merger.do_merge()
359
 
 
360
 
    def test_merge3_will_detect_cherrypick(self):
361
 
        this_tree = self.make_branch_and_tree('this')
362
 
        self.build_tree_contents([('this/file', "a\n")])
363
 
        this_tree.add('file')
364
 
        this_tree.commit('rev1')
365
 
        other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
366
 
        self.build_tree_contents([('other/file', "a\nb\n")])
367
 
        other_tree.commit('rev2b', rev_id='rev2b')
368
 
        self.build_tree_contents([('other/file', "a\nb\nc\n")])
369
 
        other_tree.commit('rev3b', rev_id='rev3b')
370
 
        this_tree.lock_write()
371
 
        self.addCleanup(this_tree.unlock)
372
 
 
373
 
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
374
 
            this_tree, 'rev3b', 'rev2b', other_tree.branch)
375
 
        merger.merge_type = _mod_merge.Merge3Merger
376
 
        merger.do_merge()
377
 
        self.assertFileEqual('a\n'
378
 
                             '<<<<<<< TREE\n'
379
 
                             '=======\n'
380
 
                             'c\n'
381
 
                             '>>>>>>> MERGE-SOURCE\n',
382
 
                             'this/file')
383
 
 
384
 
    def test_make_merger(self):
385
 
        this_tree = self.make_branch_and_tree('this')
386
 
        this_tree.commit('rev1', rev_id='rev1')
387
 
        other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
388
 
        this_tree.commit('rev2', rev_id='rev2a')
389
 
        other_tree.commit('rev2', rev_id='rev2b')
390
 
        this_tree.lock_write()
391
 
        self.addCleanup(this_tree.unlock)
392
 
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress,
393
 
            this_tree, 'rev2b', other_branch=other_tree.branch)
394
 
        merger.merge_type = _mod_merge.Merge3Merger
395
 
        tree_merger = merger.make_merger()
396
 
        self.assertIs(_mod_merge.Merge3Merger, tree_merger.__class__)
397
 
        self.assertEqual('rev2b', tree_merger.other_tree.get_revision_id())
398
 
        self.assertEqual('rev1', tree_merger.base_tree.get_revision_id())
399
 
 
400
 
    def test_make_preview_transform(self):
401
 
        this_tree = self.make_branch_and_tree('this')
402
 
        self.build_tree_contents([('this/file', '1\n')])
403
 
        this_tree.add('file', 'file-id')
404
 
        this_tree.commit('rev1', rev_id='rev1')
405
 
        other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
406
 
        self.build_tree_contents([('this/file', '1\n2a\n')])
407
 
        this_tree.commit('rev2', rev_id='rev2a')
408
 
        self.build_tree_contents([('other/file', '2b\n1\n')])
409
 
        other_tree.commit('rev2', rev_id='rev2b')
410
 
        this_tree.lock_write()
411
 
        self.addCleanup(this_tree.unlock)
412
 
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
413
 
            this_tree, 'rev2b', other_branch=other_tree.branch)
414
 
        merger.merge_type = _mod_merge.Merge3Merger
415
 
        tree_merger = merger.make_merger()
416
 
        tt = tree_merger.make_preview_transform()
417
 
        self.addCleanup(tt.finalize)
418
 
        preview_tree = tt.get_preview_tree()
419
 
        tree_file = this_tree.get_file('file-id')
420
 
        try:
421
 
            self.assertEqual('1\n2a\n', tree_file.read())
422
 
        finally:
423
 
            tree_file.close()
424
 
        preview_file = preview_tree.get_file('file-id')
425
 
        try:
426
 
            self.assertEqual('2b\n1\n2a\n', preview_file.read())
427
 
        finally:
428
 
            preview_file.close()
429
 
 
430
 
    def test_do_merge(self):
431
 
        this_tree = self.make_branch_and_tree('this')
432
 
        self.build_tree_contents([('this/file', '1\n')])
433
 
        this_tree.add('file', 'file-id')
434
 
        this_tree.commit('rev1', rev_id='rev1')
435
 
        other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
436
 
        self.build_tree_contents([('this/file', '1\n2a\n')])
437
 
        this_tree.commit('rev2', rev_id='rev2a')
438
 
        self.build_tree_contents([('other/file', '2b\n1\n')])
439
 
        other_tree.commit('rev2', rev_id='rev2b')
440
 
        this_tree.lock_write()
441
 
        self.addCleanup(this_tree.unlock)
442
 
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
443
 
            this_tree, 'rev2b', other_branch=other_tree.branch)
444
 
        merger.merge_type = _mod_merge.Merge3Merger
445
 
        tree_merger = merger.make_merger()
446
 
        tt = tree_merger.do_merge()
447
 
        tree_file = this_tree.get_file('file-id')
448
 
        try:
449
 
            self.assertEqual('2b\n1\n2a\n', tree_file.read())
450
 
        finally:
451
 
            tree_file.close()
452
 
 
453
 
    def test_merge_add_into_deleted_root(self):
454
 
        # Yes, people actually do this.  And report bugs if it breaks.
455
 
        source = self.make_branch_and_tree('source', format='rich-root-pack')
456
 
        self.build_tree(['source/foo/'])
457
 
        source.add('foo', 'foo-id')
458
 
        source.commit('Add foo')
459
 
        target = source.bzrdir.sprout('target').open_workingtree()
460
 
        subtree = target.extract('foo-id')
461
 
        subtree.commit('Delete root')
462
 
        self.build_tree(['source/bar'])
463
 
        source.add('bar', 'bar-id')
464
 
        source.commit('Add bar')
465
 
        subtree.merge_from_branch(source.branch)
466
 
 
467
 
    def test_merge_joined_branch(self):
468
 
        source = self.make_branch_and_tree('source', format='rich-root-pack')
469
 
        self.build_tree(['source/foo'])
470
 
        source.add('foo')
471
 
        source.commit('Add foo')
472
 
        target = self.make_branch_and_tree('target', format='rich-root-pack')
473
 
        self.build_tree(['target/bla'])
474
 
        target.add('bla')
475
 
        target.commit('Add bla')
476
 
        nested = source.bzrdir.sprout('target/subtree').open_workingtree()
477
 
        target.subsume(nested)
478
 
        target.commit('Join nested')
479
 
        self.build_tree(['source/bar'])
480
 
        source.add('bar')
481
 
        source.commit('Add bar')
482
 
        target.merge_from_branch(source.branch)
483
 
        target.commit('Merge source')
484
 
 
485
 
 
486
 
class TestPlanMerge(TestCaseWithMemoryTransport):
487
 
 
488
 
    def setUp(self):
489
 
        TestCaseWithMemoryTransport.setUp(self)
490
 
        mapper = versionedfile.PrefixMapper()
491
 
        factory = knit.make_file_factory(True, mapper)
492
 
        self.vf = factory(self.get_transport())
493
 
        self.plan_merge_vf = versionedfile._PlanMergeVersionedFile('root')
494
 
        self.plan_merge_vf.fallback_versionedfiles.append(self.vf)
495
 
 
496
 
    def add_version(self, key, parents, text):
497
 
        self.vf.add_lines(key, parents, [c+'\n' for c in text])
498
 
 
499
 
    def add_rev(self, prefix, revision_id, parents, text):
500
 
        self.add_version((prefix, revision_id), [(prefix, p) for p in parents],
501
 
                         text)
502
 
 
503
 
    def add_uncommitted_version(self, key, parents, text):
504
 
        self.plan_merge_vf.add_lines(key, parents,
505
 
                                     [c+'\n' for c in text])
506
 
 
507
 
    def setup_plan_merge(self):
508
 
        self.add_rev('root', 'A', [], 'abc')
509
 
        self.add_rev('root', 'B', ['A'], 'acehg')
510
 
        self.add_rev('root', 'C', ['A'], 'fabg')
511
 
        return _PlanMerge('B', 'C', self.plan_merge_vf, ('root',))
512
 
 
513
 
    def setup_plan_merge_uncommitted(self):
514
 
        self.add_version(('root', 'A'), [], 'abc')
515
 
        self.add_uncommitted_version(('root', 'B:'), [('root', 'A')], 'acehg')
516
 
        self.add_uncommitted_version(('root', 'C:'), [('root', 'A')], 'fabg')
517
 
        return _PlanMerge('B:', 'C:', self.plan_merge_vf, ('root',))
518
 
 
519
 
    def test_unique_lines(self):
520
 
        plan = self.setup_plan_merge()
521
 
        self.assertEqual(plan._unique_lines(
522
 
            plan._get_matching_blocks('B', 'C')),
523
 
            ([1, 2, 3], [0, 2]))
524
 
 
525
 
    def test_plan_merge(self):
526
 
        self.setup_plan_merge()
527
 
        plan = self.plan_merge_vf.plan_merge('B', 'C')
528
 
        self.assertEqual([
529
 
                          ('new-b', 'f\n'),
530
 
                          ('unchanged', 'a\n'),
531
 
                          ('killed-a', 'b\n'),
532
 
                          ('killed-b', 'c\n'),
533
 
                          ('new-a', 'e\n'),
534
 
                          ('new-a', 'h\n'),
535
 
                          ('new-a', 'g\n'),
536
 
                          ('new-b', 'g\n')],
537
 
                         list(plan))
538
 
 
539
 
    def test_plan_merge_cherrypick(self):
540
 
        self.add_rev('root', 'A', [], 'abc')
541
 
        self.add_rev('root', 'B', ['A'], 'abcde')
542
 
        self.add_rev('root', 'C', ['A'], 'abcefg')
543
 
        self.add_rev('root', 'D', ['A', 'B', 'C'], 'abcdegh')
544
 
        my_plan = _PlanMerge('B', 'D', self.plan_merge_vf, ('root',))
545
 
        # We shortcut when one text supersedes the other in the per-file graph.
546
 
        # We don't actually need to compare the texts at this point.
547
 
        self.assertEqual([
548
 
                          ('new-b', 'a\n'),
549
 
                          ('new-b', 'b\n'),
550
 
                          ('new-b', 'c\n'),
551
 
                          ('new-b', 'd\n'),
552
 
                          ('new-b', 'e\n'),
553
 
                          ('new-b', 'g\n'),
554
 
                          ('new-b', 'h\n')],
555
 
                          list(my_plan.plan_merge()))
556
 
 
557
 
    def test_plan_merge_no_common_ancestor(self):
558
 
        self.add_rev('root', 'A', [], 'abc')
559
 
        self.add_rev('root', 'B', [], 'xyz')
560
 
        my_plan = _PlanMerge('A', 'B', self.plan_merge_vf, ('root',))
561
 
        self.assertEqual([
562
 
                          ('new-a', 'a\n'),
563
 
                          ('new-a', 'b\n'),
564
 
                          ('new-a', 'c\n'),
565
 
                          ('new-b', 'x\n'),
566
 
                          ('new-b', 'y\n'),
567
 
                          ('new-b', 'z\n')],
568
 
                          list(my_plan.plan_merge()))
569
 
 
570
 
    def test_plan_merge_tail_ancestors(self):
571
 
        # The graph looks like this:
572
 
        #       A       # Common to all ancestors
573
 
        #      / \
574
 
        #     B   C     # Ancestors of E, only common to one side
575
 
        #     |\ /|
576
 
        #     D E F     # D, F are unique to G, H respectively
577
 
        #     |/ \|     # E is the LCA for G & H, and the unique LCA for
578
 
        #     G   H     # I, J
579
 
        #     |\ /|
580
 
        #     | X |
581
 
        #     |/ \|
582
 
        #     I   J     # criss-cross merge of G, H
583
 
        #
584
 
        # In this situation, a simple pruning of ancestors of E will leave D &
585
 
        # F "dangling", which looks like they introduce lines different from
586
 
        # the ones in E, but in actuality C&B introduced the lines, and they
587
 
        # are already present in E
588
 
 
589
 
        # Introduce the base text
590
 
        self.add_rev('root', 'A', [], 'abc')
591
 
        # Introduces a new line B
592
 
        self.add_rev('root', 'B', ['A'], 'aBbc')
593
 
        # Introduces a new line C
594
 
        self.add_rev('root', 'C', ['A'], 'abCc')
595
 
        # Introduce new line D
596
 
        self.add_rev('root', 'D', ['B'], 'DaBbc')
597
 
        # Merges B and C by just incorporating both
598
 
        self.add_rev('root', 'E', ['B', 'C'], 'aBbCc')
599
 
        # Introduce new line F
600
 
        self.add_rev('root', 'F', ['C'], 'abCcF')
601
 
        # Merge D & E by just combining the texts
602
 
        self.add_rev('root', 'G', ['D', 'E'], 'DaBbCc')
603
 
        # Merge F & E by just combining the texts
604
 
        self.add_rev('root', 'H', ['F', 'E'], 'aBbCcF')
605
 
        # Merge G & H by just combining texts
606
 
        self.add_rev('root', 'I', ['G', 'H'], 'DaBbCcF')
607
 
        # Merge G & H but supersede an old line in B
608
 
        self.add_rev('root', 'J', ['H', 'G'], 'DaJbCcF')
609
 
        plan = self.plan_merge_vf.plan_merge('I', 'J')
610
 
        self.assertEqual([
611
 
                          ('unchanged', 'D\n'),
612
 
                          ('unchanged', 'a\n'),
613
 
                          ('killed-b', 'B\n'),
614
 
                          ('new-b', 'J\n'),
615
 
                          ('unchanged', 'b\n'),
616
 
                          ('unchanged', 'C\n'),
617
 
                          ('unchanged', 'c\n'),
618
 
                          ('unchanged', 'F\n')],
619
 
                         list(plan))
620
 
 
621
 
    def test_plan_merge_tail_triple_ancestors(self):
622
 
        # The graph looks like this:
623
 
        #       A       # Common to all ancestors
624
 
        #      / \
625
 
        #     B   C     # Ancestors of E, only common to one side
626
 
        #     |\ /|
627
 
        #     D E F     # D, F are unique to G, H respectively
628
 
        #     |/|\|     # E is the LCA for G & H, and the unique LCA for
629
 
        #     G Q H     # I, J
630
 
        #     |\ /|     # Q is just an extra node which is merged into both
631
 
        #     | X |     # I and J
632
 
        #     |/ \|
633
 
        #     I   J     # criss-cross merge of G, H
634
 
        #
635
 
        # This is the same as the test_plan_merge_tail_ancestors, except we add
636
 
        # a third LCA that doesn't add new lines, but will trigger our more
637
 
        # involved ancestry logic
638
 
 
639
 
        self.add_rev('root', 'A', [], 'abc')
640
 
        self.add_rev('root', 'B', ['A'], 'aBbc')
641
 
        self.add_rev('root', 'C', ['A'], 'abCc')
642
 
        self.add_rev('root', 'D', ['B'], 'DaBbc')
643
 
        self.add_rev('root', 'E', ['B', 'C'], 'aBbCc')
644
 
        self.add_rev('root', 'F', ['C'], 'abCcF')
645
 
        self.add_rev('root', 'G', ['D', 'E'], 'DaBbCc')
646
 
        self.add_rev('root', 'H', ['F', 'E'], 'aBbCcF')
647
 
        self.add_rev('root', 'Q', ['E'], 'aBbCc')
648
 
        self.add_rev('root', 'I', ['G', 'Q', 'H'], 'DaBbCcF')
649
 
        # Merge G & H but supersede an old line in B
650
 
        self.add_rev('root', 'J', ['H', 'Q', 'G'], 'DaJbCcF')
651
 
        plan = self.plan_merge_vf.plan_merge('I', 'J')
652
 
        self.assertEqual([
653
 
                          ('unchanged', 'D\n'),
654
 
                          ('unchanged', 'a\n'),
655
 
                          ('killed-b', 'B\n'),
656
 
                          ('new-b', 'J\n'),
657
 
                          ('unchanged', 'b\n'),
658
 
                          ('unchanged', 'C\n'),
659
 
                          ('unchanged', 'c\n'),
660
 
                          ('unchanged', 'F\n')],
661
 
                         list(plan))
662
 
 
663
 
    def test_plan_merge_2_tail_triple_ancestors(self):
664
 
        # The graph looks like this:
665
 
        #     A   B     # 2 tails going back to NULL
666
 
        #     |\ /|
667
 
        #     D E F     # D, is unique to G, F to H
668
 
        #     |/|\|     # E is the LCA for G & H, and the unique LCA for
669
 
        #     G Q H     # I, J
670
 
        #     |\ /|     # Q is just an extra node which is merged into both
671
 
        #     | X |     # I and J
672
 
        #     |/ \|
673
 
        #     I   J     # criss-cross merge of G, H (and Q)
674
 
        #
675
 
 
676
 
        # This is meant to test after hitting a 3-way LCA, and multiple tail
677
 
        # ancestors (only have NULL_REVISION in common)
678
 
 
679
 
        self.add_rev('root', 'A', [], 'abc')
680
 
        self.add_rev('root', 'B', [], 'def')
681
 
        self.add_rev('root', 'D', ['A'], 'Dabc')
682
 
        self.add_rev('root', 'E', ['A', 'B'], 'abcdef')
683
 
        self.add_rev('root', 'F', ['B'], 'defF')
684
 
        self.add_rev('root', 'G', ['D', 'E'], 'Dabcdef')
685
 
        self.add_rev('root', 'H', ['F', 'E'], 'abcdefF')
686
 
        self.add_rev('root', 'Q', ['E'], 'abcdef')
687
 
        self.add_rev('root', 'I', ['G', 'Q', 'H'], 'DabcdefF')
688
 
        # Merge G & H but supersede an old line in B
689
 
        self.add_rev('root', 'J', ['H', 'Q', 'G'], 'DabcdJfF')
690
 
        plan = self.plan_merge_vf.plan_merge('I', 'J')
691
 
        self.assertEqual([
692
 
                          ('unchanged', 'D\n'),
693
 
                          ('unchanged', 'a\n'),
694
 
                          ('unchanged', 'b\n'),
695
 
                          ('unchanged', 'c\n'),
696
 
                          ('unchanged', 'd\n'),
697
 
                          ('killed-b', 'e\n'),
698
 
                          ('new-b', 'J\n'),
699
 
                          ('unchanged', 'f\n'),
700
 
                          ('unchanged', 'F\n')],
701
 
                         list(plan))
702
 
 
703
 
    def test_plan_merge_uncommitted_files(self):
704
 
        self.setup_plan_merge_uncommitted()
705
 
        plan = self.plan_merge_vf.plan_merge('B:', 'C:')
706
 
        self.assertEqual([
707
 
                          ('new-b', 'f\n'),
708
 
                          ('unchanged', 'a\n'),
709
 
                          ('killed-a', 'b\n'),
710
 
                          ('killed-b', 'c\n'),
711
 
                          ('new-a', 'e\n'),
712
 
                          ('new-a', 'h\n'),
713
 
                          ('new-a', 'g\n'),
714
 
                          ('new-b', 'g\n')],
715
 
                         list(plan))
716
 
 
717
 
    def test_plan_merge_insert_order(self):
718
 
        """Weave merges are sensitive to the order of insertion.
719
 
        
720
 
        Specifically for overlapping regions, it effects which region gets put
721
 
        'first'. And when a user resolves an overlapping merge, if they use the
722
 
        same ordering, then the lines match the parents, if they don't only
723
 
        *some* of the lines match.
724
 
        """
725
 
        self.add_rev('root', 'A', [], 'abcdef')
726
 
        self.add_rev('root', 'B', ['A'], 'abwxcdef')
727
 
        self.add_rev('root', 'C', ['A'], 'abyzcdef')
728
 
        # Merge, and resolve the conflict by adding *both* sets of lines
729
 
        # If we get the ordering wrong, these will look like new lines in D,
730
 
        # rather than carried over from B, C
731
 
        self.add_rev('root', 'D', ['B', 'C'],
732
 
                         'abwxyzcdef')
733
 
        # Supersede the lines in B and delete the lines in C, which will
734
 
        # conflict if they are treated as being in D
735
 
        self.add_rev('root', 'E', ['C', 'B'],
736
 
                         'abnocdef')
737
 
        # Same thing for the lines in C
738
 
        self.add_rev('root', 'F', ['C'], 'abpqcdef')
739
 
        plan = self.plan_merge_vf.plan_merge('D', 'E')
740
 
        self.assertEqual([
741
 
                          ('unchanged', 'a\n'),
742
 
                          ('unchanged', 'b\n'),
743
 
                          ('killed-b', 'w\n'),
744
 
                          ('killed-b', 'x\n'),
745
 
                          ('killed-b', 'y\n'),
746
 
                          ('killed-b', 'z\n'),
747
 
                          ('new-b', 'n\n'),
748
 
                          ('new-b', 'o\n'),
749
 
                          ('unchanged', 'c\n'),
750
 
                          ('unchanged', 'd\n'),
751
 
                          ('unchanged', 'e\n'),
752
 
                          ('unchanged', 'f\n')],
753
 
                         list(plan))
754
 
        plan = self.plan_merge_vf.plan_merge('E', 'D')
755
 
        # Going in the opposite direction shows the effect of the opposite plan
756
 
        self.assertEqual([
757
 
                          ('unchanged', 'a\n'),
758
 
                          ('unchanged', 'b\n'),
759
 
                          ('new-b', 'w\n'),
760
 
                          ('new-b', 'x\n'),
761
 
                          ('killed-a', 'y\n'),
762
 
                          ('killed-a', 'z\n'),
763
 
                          ('killed-both', 'w\n'),
764
 
                          ('killed-both', 'x\n'),
765
 
                          ('new-a', 'n\n'),
766
 
                          ('new-a', 'o\n'),
767
 
                          ('unchanged', 'c\n'),
768
 
                          ('unchanged', 'd\n'),
769
 
                          ('unchanged', 'e\n'),
770
 
                          ('unchanged', 'f\n')],
771
 
                         list(plan))
772
 
 
773
 
    def test_plan_merge_criss_cross(self):
774
 
        # This is specificly trying to trigger problems when using limited
775
 
        # ancestry and weaves. The ancestry graph looks like:
776
 
        #       XX      unused ancestor, should not show up in the weave
777
 
        #       |
778
 
        #       A       Unique LCA
779
 
        #       |\
780
 
        #       B \     Introduces a line 'foo'
781
 
        #      / \ \
782
 
        #     C   D E   C & D both have 'foo', E has different changes
783
 
        #     |\ /| |
784
 
        #     | X | |
785
 
        #     |/ \|/
786
 
        #     F   G      All of C, D, E are merged into F and G, so they are
787
 
        #                all common ancestors.
788
 
        #
789
 
        # The specific issue with weaves:
790
 
        #   B introduced a text ('foo') that is present in both C and D.
791
 
        #   If we do not include B (because it isn't an ancestor of E), then
792
 
        #   the A=>C and A=>D look like both sides independently introduce the
793
 
        #   text ('foo'). If F does not modify the text, it would still appear
794
 
        #   to have deleted on of the versions from C or D. If G then modifies
795
 
        #   'foo', it should appear as superseding the value in F (since it
796
 
        #   came from B), rather than conflict because of the resolution during
797
 
        #   C & D.
798
 
        self.add_rev('root', 'XX', [], 'qrs')
799
 
        self.add_rev('root', 'A', ['XX'], 'abcdef')
800
 
        self.add_rev('root', 'B', ['A'], 'axcdef')
801
 
        self.add_rev('root', 'C', ['B'], 'axcdefg')
802
 
        self.add_rev('root', 'D', ['B'], 'haxcdef')
803
 
        self.add_rev('root', 'E', ['A'], 'abcdyf')
804
 
        # Simple combining of all texts
805
 
        self.add_rev('root', 'F', ['C', 'D', 'E'], 'haxcdyfg')
806
 
        # combine and supersede 'x'
807
 
        self.add_rev('root', 'G', ['C', 'D', 'E'], 'hazcdyfg')
808
 
        plan = self.plan_merge_vf.plan_merge('F', 'G')
809
 
        self.assertEqual([
810
 
                          ('unchanged', 'h\n'),
811
 
                          ('unchanged', 'a\n'),
812
 
                          ('killed-base', 'b\n'),
813
 
                          ('killed-b', 'x\n'),
814
 
                          ('new-b', 'z\n'),
815
 
                          ('unchanged', 'c\n'),
816
 
                          ('unchanged', 'd\n'),
817
 
                          ('killed-base', 'e\n'),
818
 
                          ('unchanged', 'y\n'),
819
 
                          ('unchanged', 'f\n'),
820
 
                          ('unchanged', 'g\n')],
821
 
                         list(plan))
822
 
 
823
 
    def assertRemoveExternalReferences(self, filtered_parent_map,
824
 
                                       child_map, tails, parent_map):
825
 
        """Assert results for _PlanMerge._remove_external_references."""
826
 
        (act_filtered_parent_map, act_child_map,
827
 
         act_tails) = _PlanMerge._remove_external_references(parent_map)
828
 
 
829
 
        # The parent map *should* preserve ordering, but the ordering of
830
 
        # children is not strictly defined
831
 
        # child_map = dict((k, sorted(children))
832
 
        #                  for k, children in child_map.iteritems())
833
 
        # act_child_map = dict(k, sorted(children)
834
 
        #                      for k, children in act_child_map.iteritems())
835
 
        self.assertEqual(filtered_parent_map, act_filtered_parent_map)
836
 
        self.assertEqual(child_map, act_child_map)
837
 
        self.assertEqual(sorted(tails), sorted(act_tails))
838
 
 
839
 
    def test__remove_external_references(self):
840
 
        # First, nothing to remove
841
 
        self.assertRemoveExternalReferences({3: [2], 2: [1], 1: []},
842
 
            {1: [2], 2: [3], 3: []}, [1], {3: [2], 2: [1], 1: []})
843
 
        # The reverse direction
844
 
        self.assertRemoveExternalReferences({1: [2], 2: [3], 3: []},
845
 
            {3: [2], 2: [1], 1: []}, [3], {1: [2], 2: [3], 3: []})
846
 
        # Extra references
847
 
        self.assertRemoveExternalReferences({3: [2], 2: [1], 1: []},
848
 
            {1: [2], 2: [3], 3: []}, [1], {3: [2, 4], 2: [1, 5], 1: [6]})
849
 
        # Multiple tails
850
 
        self.assertRemoveExternalReferences(
851
 
            {4: [2, 3], 3: [], 2: [1], 1: []},
852
 
            {1: [2], 2: [4], 3: [4], 4: []},
853
 
            [1, 3],
854
 
            {4: [2, 3], 3: [5], 2: [1], 1: [6]})
855
 
        # Multiple children
856
 
        self.assertRemoveExternalReferences(
857
 
            {1: [3], 2: [3, 4], 3: [], 4: []},
858
 
            {1: [], 2: [], 3: [1, 2], 4: [2]},
859
 
            [3, 4],
860
 
            {1: [3], 2: [3, 4], 3: [5], 4: []})
861
 
 
862
 
    def assertPruneTails(self, pruned_map, tails, parent_map):
863
 
        child_map = {}
864
 
        for key, parent_keys in parent_map.iteritems():
865
 
            child_map.setdefault(key, [])
866
 
            for pkey in parent_keys:
867
 
                child_map.setdefault(pkey, []).append(key)
868
 
        _PlanMerge._prune_tails(parent_map, child_map, tails)
869
 
        self.assertEqual(pruned_map, parent_map)
870
 
 
871
 
    def test__prune_tails(self):
872
 
        # Nothing requested to prune
873
 
        self.assertPruneTails({1: [], 2: [], 3: []}, [],
874
 
                              {1: [], 2: [], 3: []})
875
 
        # Prune a single entry
876
 
        self.assertPruneTails({1: [], 3: []}, [2],
877
 
                              {1: [], 2: [], 3: []})
878
 
        # Prune a chain
879
 
        self.assertPruneTails({1: []}, [3],
880
 
                              {1: [], 2: [3], 3: []})
881
 
        # Prune a chain with a diamond
882
 
        self.assertPruneTails({1: []}, [5],
883
 
                              {1: [], 2: [3, 4], 3: [5], 4: [5], 5: []})
884
 
        # Prune a partial chain
885
 
        self.assertPruneTails({1: [6], 6:[]}, [5],
886
 
                              {1: [2, 6], 2: [3, 4], 3: [5], 4: [5], 5: [],
887
 
                               6: []})
888
 
        # Prune a chain with multiple tips, that pulls out intermediates
889
 
        self.assertPruneTails({1:[3], 3:[]}, [4, 5],
890
 
                              {1: [2, 3], 2: [4, 5], 3: [], 4:[], 5:[]})
891
 
        self.assertPruneTails({1:[3], 3:[]}, [5, 4],
892
 
                              {1: [2, 3], 2: [4, 5], 3: [], 4:[], 5:[]})
893
 
 
894
 
    def test_subtract_plans(self):
895
 
        old_plan = [
896
 
        ('unchanged', 'a\n'),
897
 
        ('new-a', 'b\n'),
898
 
        ('killed-a', 'c\n'),
899
 
        ('new-b', 'd\n'),
900
 
        ('new-b', 'e\n'),
901
 
        ('killed-b', 'f\n'),
902
 
        ('killed-b', 'g\n'),
903
 
        ]
904
 
        new_plan = [
905
 
        ('unchanged', 'a\n'),
906
 
        ('new-a', 'b\n'),
907
 
        ('killed-a', 'c\n'),
908
 
        ('new-b', 'd\n'),
909
 
        ('new-b', 'h\n'),
910
 
        ('killed-b', 'f\n'),
911
 
        ('killed-b', 'i\n'),
912
 
        ]
913
 
        subtracted_plan = [
914
 
        ('unchanged', 'a\n'),
915
 
        ('new-a', 'b\n'),
916
 
        ('killed-a', 'c\n'),
917
 
        ('new-b', 'h\n'),
918
 
        ('unchanged', 'f\n'),
919
 
        ('killed-b', 'i\n'),
920
 
        ]
921
 
        self.assertEqual(subtracted_plan,
922
 
            list(_PlanMerge._subtract_plans(old_plan, new_plan)))
923
 
 
924
 
    def setup_merge_with_base(self):
925
 
        self.add_rev('root', 'COMMON', [], 'abc')
926
 
        self.add_rev('root', 'THIS', ['COMMON'], 'abcd')
927
 
        self.add_rev('root', 'BASE', ['COMMON'], 'eabc')
928
 
        self.add_rev('root', 'OTHER', ['BASE'], 'eafb')
929
 
 
930
 
    def test_plan_merge_with_base(self):
931
 
        self.setup_merge_with_base()
932
 
        plan = self.plan_merge_vf.plan_merge('THIS', 'OTHER', 'BASE')
933
 
        self.assertEqual([('unchanged', 'a\n'),
934
 
                          ('new-b', 'f\n'),
935
 
                          ('unchanged', 'b\n'),
936
 
                          ('killed-b', 'c\n'),
937
 
                          ('new-a', 'd\n')
938
 
                         ], list(plan))
939
 
 
940
 
    def test_plan_lca_merge(self):
941
 
        self.setup_plan_merge()
942
 
        plan = self.plan_merge_vf.plan_lca_merge('B', 'C')
943
 
        self.assertEqual([
944
 
                          ('new-b', 'f\n'),
945
 
                          ('unchanged', 'a\n'),
946
 
                          ('killed-b', 'c\n'),
947
 
                          ('new-a', 'e\n'),
948
 
                          ('new-a', 'h\n'),
949
 
                          ('killed-a', 'b\n'),
950
 
                          ('unchanged', 'g\n')],
951
 
                         list(plan))
952
 
 
953
 
    def test_plan_lca_merge_uncommitted_files(self):
954
 
        self.setup_plan_merge_uncommitted()
955
 
        plan = self.plan_merge_vf.plan_lca_merge('B:', 'C:')
956
 
        self.assertEqual([
957
 
                          ('new-b', 'f\n'),
958
 
                          ('unchanged', 'a\n'),
959
 
                          ('killed-b', 'c\n'),
960
 
                          ('new-a', 'e\n'),
961
 
                          ('new-a', 'h\n'),
962
 
                          ('killed-a', 'b\n'),
963
 
                          ('unchanged', 'g\n')],
964
 
                         list(plan))
965
 
 
966
 
    def test_plan_lca_merge_with_base(self):
967
 
        self.setup_merge_with_base()
968
 
        plan = self.plan_merge_vf.plan_lca_merge('THIS', 'OTHER', 'BASE')
969
 
        self.assertEqual([('unchanged', 'a\n'),
970
 
                          ('new-b', 'f\n'),
971
 
                          ('unchanged', 'b\n'),
972
 
                          ('killed-b', 'c\n'),
973
 
                          ('new-a', 'd\n')
974
 
                         ], list(plan))
975
 
 
976
 
    def test_plan_lca_merge_with_criss_cross(self):
977
 
        self.add_version(('root', 'ROOT'), [], 'abc')
978
 
        # each side makes a change
979
 
        self.add_version(('root', 'REV1'), [('root', 'ROOT')], 'abcd')
980
 
        self.add_version(('root', 'REV2'), [('root', 'ROOT')], 'abce')
981
 
        # both sides merge, discarding others' changes
982
 
        self.add_version(('root', 'LCA1'),
983
 
            [('root', 'REV1'), ('root', 'REV2')], 'abcd')
984
 
        self.add_version(('root', 'LCA2'),
985
 
            [('root', 'REV1'), ('root', 'REV2')], 'fabce')
986
 
        plan = self.plan_merge_vf.plan_lca_merge('LCA1', 'LCA2')
987
 
        self.assertEqual([('new-b', 'f\n'),
988
 
                          ('unchanged', 'a\n'),
989
 
                          ('unchanged', 'b\n'),
990
 
                          ('unchanged', 'c\n'),
991
 
                          ('conflicted-a', 'd\n'),
992
 
                          ('conflicted-b', 'e\n'),
993
 
                         ], list(plan))
994
 
 
995
 
    def test_plan_lca_merge_with_null(self):
996
 
        self.add_version(('root', 'A'), [], 'ab')
997
 
        self.add_version(('root', 'B'), [], 'bc')
998
 
        plan = self.plan_merge_vf.plan_lca_merge('A', 'B')
999
 
        self.assertEqual([('new-a', 'a\n'),
1000
 
                          ('unchanged', 'b\n'),
1001
 
                          ('new-b', 'c\n'),
1002
 
                         ], list(plan))
1003
 
 
1004
 
    def test_plan_merge_with_delete_and_change(self):
1005
 
        self.add_rev('root', 'C', [], 'a')
1006
 
        self.add_rev('root', 'A', ['C'], 'b')
1007
 
        self.add_rev('root', 'B', ['C'], '')
1008
 
        plan = self.plan_merge_vf.plan_merge('A', 'B')
1009
 
        self.assertEqual([('killed-both', 'a\n'),
1010
 
                          ('new-a', 'b\n'),
1011
 
                         ], list(plan))
1012
 
 
1013
 
    def test_plan_merge_with_move_and_change(self):
1014
 
        self.add_rev('root', 'C', [], 'abcd')
1015
 
        self.add_rev('root', 'A', ['C'], 'acbd')
1016
 
        self.add_rev('root', 'B', ['C'], 'aBcd')
1017
 
        plan = self.plan_merge_vf.plan_merge('A', 'B')
1018
 
        self.assertEqual([('unchanged', 'a\n'),
1019
 
                          ('new-a', 'c\n'),
1020
 
                          ('killed-b', 'b\n'),
1021
 
                          ('new-b', 'B\n'),
1022
 
                          ('killed-a', 'c\n'),
1023
 
                          ('unchanged', 'd\n'),
1024
 
                         ], list(plan))
1025
 
 
1026
 
 
1027
 
class TestMergeImplementation(object):
1028
 
 
1029
 
    def do_merge(self, target_tree, source_tree, **kwargs):
1030
 
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
1031
 
            target_tree, source_tree.last_revision(),
1032
 
            other_branch=source_tree.branch)
1033
 
        merger.merge_type=self.merge_type
1034
 
        for name, value in kwargs.items():
1035
 
            setattr(merger, name, value)
1036
 
        merger.do_merge()
1037
 
 
1038
 
    def test_merge_specific_file(self):
1039
 
        this_tree = self.make_branch_and_tree('this')
1040
 
        this_tree.lock_write()
1041
 
        self.addCleanup(this_tree.unlock)
1042
 
        self.build_tree_contents([
1043
 
            ('this/file1', 'a\nb\n'),
1044
 
            ('this/file2', 'a\nb\n')
1045
 
        ])
1046
 
        this_tree.add(['file1', 'file2'])
1047
 
        this_tree.commit('Added files')
1048
 
        other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
1049
 
        self.build_tree_contents([
1050
 
            ('other/file1', 'a\nb\nc\n'),
1051
 
            ('other/file2', 'a\nb\nc\n')
1052
 
        ])
1053
 
        other_tree.commit('modified both')
1054
 
        self.build_tree_contents([
1055
 
            ('this/file1', 'd\na\nb\n'),
1056
 
            ('this/file2', 'd\na\nb\n')
1057
 
        ])
1058
 
        this_tree.commit('modified both')
1059
 
        self.do_merge(this_tree, other_tree, interesting_files=['file1'])
1060
 
        self.assertFileEqual('d\na\nb\nc\n', 'this/file1')
1061
 
        self.assertFileEqual('d\na\nb\n', 'this/file2')
1062
 
 
1063
 
    def test_merge_move_and_change(self):
1064
 
        this_tree = self.make_branch_and_tree('this')
1065
 
        this_tree.lock_write()
1066
 
        self.addCleanup(this_tree.unlock)
1067
 
        self.build_tree_contents([
1068
 
            ('this/file1', 'line 1\nline 2\nline 3\nline 4\n'),
1069
 
        ])
1070
 
        this_tree.add('file1',)
1071
 
        this_tree.commit('Added file')
1072
 
        other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
1073
 
        self.build_tree_contents([
1074
 
            ('other/file1', 'line 1\nline 2 to 2.1\nline 3\nline 4\n'),
1075
 
        ])
1076
 
        other_tree.commit('Changed 2 to 2.1')
1077
 
        self.build_tree_contents([
1078
 
            ('this/file1', 'line 1\nline 3\nline 2\nline 4\n'),
1079
 
        ])
1080
 
        this_tree.commit('Swapped 2 & 3')
1081
 
        self.do_merge(this_tree, other_tree)
1082
 
        self.assertFileEqual('line 1\n'
1083
 
            '<<<<<<< TREE\n'
1084
 
            'line 3\n'
1085
 
            'line 2\n'
1086
 
            '=======\n'
1087
 
            'line 2 to 2.1\n'
1088
 
            'line 3\n'
1089
 
            '>>>>>>> MERGE-SOURCE\n'
1090
 
            'line 4\n', 'this/file1')
1091
 
 
1092
 
 
1093
 
class TestMerge3Merge(TestCaseWithTransport, TestMergeImplementation):
1094
 
 
1095
 
    merge_type = _mod_merge.Merge3Merger
1096
 
 
1097
 
 
1098
 
class TestWeaveMerge(TestCaseWithTransport, TestMergeImplementation):
1099
 
 
1100
 
    merge_type = _mod_merge.WeaveMerger
1101
 
 
1102
 
 
1103
 
class TestLCAMerge(TestCaseWithTransport, TestMergeImplementation):
1104
 
 
1105
 
    merge_type = _mod_merge.LCAMerger
1106
 
 
1107
 
    def test_merge_move_and_change(self):
1108
 
        self.expectFailure("lca merge doesn't conflict for move and change",
1109
 
            super(TestLCAMerge, self).test_merge_move_and_change)