/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2017-11-21 20:14:44 UTC
  • mfrom: (6821.1.1 ignore-warnings)
  • Revision ID: jelmer@jelmer.uk-20171121201444-dvb7yjku3zwjev83
Merge lp:~jelmer/brz/ignore-warnings.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_merge.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2012, 2016 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
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
import os
18
 
from StringIO import StringIO
19
18
 
20
 
from bzrlib import (
 
19
from .. import (
 
20
    branch as _mod_branch,
 
21
    cleanup,
21
22
    conflicts,
22
23
    errors,
23
 
    knit,
24
24
    memorytree,
25
25
    merge as _mod_merge,
26
26
    option,
27
 
    progress,
 
27
    revision as _mod_revision,
28
28
    tests,
29
29
    transform,
 
30
    )
 
31
from ..bzr import (
 
32
    inventory,
 
33
    knit,
30
34
    versionedfile,
31
35
    )
32
 
from bzrlib.conflicts import ConflictList, TextConflict
33
 
from bzrlib.errors import UnrelatedBranches, NoCommits
34
 
from bzrlib.merge import transform_tree, merge_inner, _PlanMerge
35
 
from bzrlib.osutils import pathjoin, file_kind
36
 
from bzrlib.tests import (
 
36
from ..conflicts import ConflictList, TextConflict
 
37
from ..errors import UnrelatedBranches, NoCommits
 
38
from ..merge import transform_tree, merge_inner, _PlanMerge
 
39
from ..osutils import basename, pathjoin, file_kind
 
40
from . import (
 
41
    features,
37
42
    TestCaseWithMemoryTransport,
38
43
    TestCaseWithTransport,
39
44
    test_merge_core,
40
45
    )
41
 
from bzrlib.workingtree import WorkingTree
 
46
from ..workingtree import WorkingTree
42
47
 
43
48
 
44
49
class TestMerge(TestCaseWithTransport):
79
84
        tip = wt1.commit('empty commit')
80
85
        wt2 = self.make_branch_and_tree('branch2')
81
86
        wt2.pull(wt1.branch)
82
 
        file('branch1/foo', 'wb').write('foo')
83
 
        file('branch1/bar', 'wb').write('bar')
 
87
        with file('branch1/foo', 'wb') as f:
 
88
            f.write('foo')
 
89
        with file('branch1/bar', 'wb') as f:
 
90
            f.write('bar')
84
91
        wt1.add('foo')
85
92
        wt1.add('bar')
86
93
        wt1.commit('add foobar')
87
 
        os.chdir('branch2')
88
 
        self.run_bzr('merge ../branch1/baz', retcode=3)
89
 
        self.run_bzr('merge ../branch1/foo')
90
 
        self.failUnlessExists('foo')
91
 
        self.failIfExists('bar')
92
 
        wt2 = WorkingTree.open('.') # opens branch2
 
94
        self.run_bzr('merge ../branch1/baz', retcode=3, working_dir='branch2')
 
95
        self.run_bzr('merge ../branch1/foo', working_dir='branch2')
 
96
        self.assertPathExists('branch2/foo')
 
97
        self.assertPathDoesNotExist('branch2/bar')
 
98
        wt2 = WorkingTree.open('branch2')
93
99
        self.assertEqual([tip], wt2.get_parent_ids())
94
100
 
95
101
    def test_pending_with_null(self):
118
124
        finally:
119
125
            wt1.unlock()
120
126
 
 
127
    def test_merge_into_null_tree(self):
 
128
        wt = self.make_branch_and_tree('tree')
 
129
        null_tree = wt.basis_tree()
 
130
        self.build_tree(['tree/file'])
 
131
        wt.add('file')
 
132
        wt.commit('tree with root')
 
133
        merger = _mod_merge.Merge3Merger(null_tree, null_tree, null_tree, wt,
 
134
                                         this_branch=wt.branch,
 
135
                                         do_merge=False)
 
136
        with merger.make_preview_transform() as tt:
 
137
            self.assertEqual([], tt.find_conflicts())
 
138
            preview = tt.get_preview_tree()
 
139
            self.assertEqual(wt.get_root_id(), preview.get_root_id())
 
140
 
 
141
    def test_merge_unrelated_retains_root(self):
 
142
        wt = self.make_branch_and_tree('tree')
 
143
        other_tree = self.make_branch_and_tree('other')
 
144
        self.addCleanup(other_tree.lock_read().unlock)
 
145
        merger = _mod_merge.Merge3Merger(wt, wt, wt.basis_tree(), other_tree,
 
146
                                         this_branch=wt.branch,
 
147
                                         do_merge=False)
 
148
        with transform.TransformPreview(wt) as merger.tt:
 
149
            merger._compute_transform()
 
150
            new_root_id = merger.tt.final_file_id(merger.tt.root)
 
151
            self.assertEqual(wt.get_root_id(), new_root_id)
 
152
 
121
153
    def test_create_rename(self):
122
154
        """Rename an inventory entry while creating the file"""
123
155
        tree =self.make_branch_and_tree('.')
124
 
        file('name1', 'wb').write('Hello')
 
156
        with file('name1', 'wb') as f: f.write('Hello')
125
157
        tree.add('name1')
126
158
        tree.commit(message="hello")
127
159
        tree.rename_one('name1', 'name2')
134
166
        os.mkdir('dirname1')
135
167
        tree.add('dirname1')
136
168
        filename = pathjoin('dirname1', 'name1')
137
 
        file(filename, 'wb').write('Hello')
 
169
        with file(filename, 'wb') as f: f.write('Hello')
138
170
        tree.add(filename)
139
171
        tree.commit(message="hello")
140
172
        filename2 = pathjoin('dirname1', 'name2')
146
178
        # Test that merge_inner's ignore zero parameter is effective
147
179
        tree_a =self.make_branch_and_tree('a')
148
180
        tree_a.commit(message="hello")
149
 
        dir_b = tree_a.bzrdir.sprout('b')
 
181
        dir_b = tree_a.controldir.sprout('b')
150
182
        tree_b = dir_b.open_workingtree()
151
183
        tree_b.lock_write()
152
184
        self.addCleanup(tree_b.unlock)
153
185
        tree_a.commit(message="hello again")
154
 
        log = StringIO()
155
186
        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(),
156
187
                    this_tree=tree_b, ignore_zero=True)
157
 
        self.failUnless('All changes applied successfully.\n' not in
 
188
        self.assertTrue('All changes applied successfully.\n' not in
158
189
            self.get_log())
159
190
        tree_b.revert()
160
191
        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(),
161
192
                    this_tree=tree_b, ignore_zero=False)
162
 
        self.failUnless('All changes applied successfully.\n' in self.get_log())
 
193
        self.assertTrue('All changes applied successfully.\n' in self.get_log())
163
194
 
164
195
    def test_merge_inner_conflicts(self):
165
196
        tree_a = self.make_branch_and_tree('a')
176
207
        # the basis tree. This mutates the tree after grabbing basis, so go to
177
208
        # the repository.
178
209
        base_tree = tree_a.branch.repository.revision_tree(tree_a.last_revision())
179
 
        tree_z = tree_a.bzrdir.sprout('z').open_workingtree()
 
210
        tree_z = tree_a.controldir.sprout('z').open_workingtree()
180
211
        self.build_tree(['a/b/c'])
181
212
        tree_a.add('b/c')
182
213
        tree_a.commit('added c')
195
226
            tree_a.conflicts())
196
227
 
197
228
    def test_nested_merge(self):
 
229
        self.knownFailure(
 
230
            'iter_changes doesn\'t work with changes in nested trees')
198
231
        tree = self.make_branch_and_tree('tree',
199
 
            format='dirstate-with-subtree')
 
232
            format='development-subtree')
200
233
        sub_tree = self.make_branch_and_tree('tree/sub-tree',
201
 
            format='dirstate-with-subtree')
 
234
            format='development-subtree')
202
235
        sub_tree.set_root_id('sub-tree-root')
203
236
        self.build_tree_contents([('tree/sub-tree/file', 'text1')])
204
237
        sub_tree.add('file')
205
238
        sub_tree.commit('foo')
206
239
        tree.add_reference(sub_tree)
207
240
        tree.commit('set text to 1')
208
 
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
241
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
209
242
        # modify the file in the subtree
210
243
        self.build_tree_contents([('tree2/sub-tree/file', 'text2')])
211
244
        # and merge the changes from the diverged subtree into the containing
223
256
        # the basis tree. This test commits to the tree after grabbing basis,
224
257
        # so we go to the repository.
225
258
        base_tree = tree_a.branch.repository.revision_tree(tree_a.last_revision())
226
 
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
 
259
        tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
227
260
        self.build_tree_contents([('tree_a/file', 'content_2')])
228
261
        tree_a.commit('commit other')
229
262
        other_tree = tree_a.basis_tree()
237
270
        self.build_tree_contents([('tree_a/file', 'content_1')])
238
271
        tree_a.add('file', 'file-id')
239
272
        tree_a.commit('added file')
240
 
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
 
273
        tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
241
274
        os.unlink('tree_a/file')
242
275
        self.build_tree(['tree_a/file/'])
243
276
        tree_a.commit('changed file to directory')
257
290
        self.assertFalse('merge4' in [x[0] for x in
258
291
                        merge_type_option.iter_switches()])
259
292
        registry = _mod_merge.get_merge_type_registry()
260
 
        registry.register_lazy('merge4', 'bzrlib.merge', 'Merge4Merger',
 
293
        registry.register_lazy('merge4', 'breezy.merge', 'Merge4Merger',
261
294
                               'time-travelling merge')
262
295
        self.assertTrue('merge4' in [x[0] for x in
263
296
                        merge_type_option.iter_switches()])
275
308
        tree_a.flush()
276
309
        tree_a.rename_one('a', 'b')
277
310
        tree_a.commit('2')
278
 
        bzrdir_b = tree_a.bzrdir.sprout('B', revision_id='rev-1')
 
311
        bzrdir_b = tree_a.controldir.sprout('B', revision_id='rev-1')
279
312
        tree_b = bzrdir_b.open_workingtree()
280
313
        tree_b.lock_write()
281
314
        self.addCleanup(tree_b.unlock)
293
326
        tree_a.commit('commit 1')
294
327
        tree_a.add(['file_2'])
295
328
        tree_a.commit('commit 2')
296
 
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
 
329
        tree_b = tree_a.controldir.sprout('b').open_workingtree()
297
330
        tree_b.rename_one('file_1', 'renamed')
298
331
        merger = _mod_merge.Merger.from_uncommitted(tree_a, tree_b)
299
332
        merger.merge_type = _mod_merge.Merge3Merger
307
340
        tree_a.commit('commit 1')
308
341
        tree_a.add(['file_2'])
309
342
        tree_a.commit('commit 2')
310
 
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
 
343
        tree_b = tree_a.controldir.sprout('b').open_workingtree()
311
344
        tree_b.rename_one('file_1', 'renamed')
312
345
        merger = _mod_merge.Merger.from_uncommitted(tree_a, tree_b)
313
346
        merger.merge_type = _mod_merge.WeaveMerger
329
362
        self.build_tree_contents([('this/file', "a\n")])
330
363
        this_tree.add('file')
331
364
        this_tree.commit('rev1')
332
 
        other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
 
365
        other_tree = this_tree.controldir.sprout('other').open_workingtree()
333
366
        self.build_tree_contents([('other/file', "a\nb\n")])
334
367
        other_tree.commit('rev2b', rev_id='rev2b')
335
368
        self.build_tree_contents([('other/file', "c\na\nb\n")])
340
373
 
341
374
    def test_weave_cherrypick(self):
342
375
        this_tree, other_tree = self.prepare_cherrypick()
343
 
        merger = _mod_merge.Merger.from_revision_ids(None,
 
376
        merger = _mod_merge.Merger.from_revision_ids(
344
377
            this_tree, 'rev3b', 'rev2b', other_tree.branch)
345
378
        merger.merge_type = _mod_merge.WeaveMerger
346
379
        merger.do_merge()
348
381
 
349
382
    def test_weave_cannot_reverse_cherrypick(self):
350
383
        this_tree, other_tree = self.prepare_cherrypick()
351
 
        merger = _mod_merge.Merger.from_revision_ids(None,
 
384
        merger = _mod_merge.Merger.from_revision_ids(
352
385
            this_tree, 'rev2b', 'rev3b', other_tree.branch)
353
386
        merger.merge_type = _mod_merge.WeaveMerger
354
387
        self.assertRaises(errors.CannotReverseCherrypick, merger.do_merge)
355
388
 
356
389
    def test_merge3_can_reverse_cherrypick(self):
357
390
        this_tree, other_tree = self.prepare_cherrypick()
358
 
        merger = _mod_merge.Merger.from_revision_ids(None,
 
391
        merger = _mod_merge.Merger.from_revision_ids(
359
392
            this_tree, 'rev2b', 'rev3b', other_tree.branch)
360
393
        merger.merge_type = _mod_merge.Merge3Merger
361
394
        merger.do_merge()
365
398
        self.build_tree_contents([('this/file', "a\n")])
366
399
        this_tree.add('file')
367
400
        this_tree.commit('rev1')
368
 
        other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
 
401
        other_tree = this_tree.controldir.sprout('other').open_workingtree()
369
402
        self.build_tree_contents([('other/file', "a\nb\n")])
370
403
        other_tree.commit('rev2b', rev_id='rev2b')
371
404
        self.build_tree_contents([('other/file', "a\nb\nc\n")])
373
406
        this_tree.lock_write()
374
407
        self.addCleanup(this_tree.unlock)
375
408
 
376
 
        merger = _mod_merge.Merger.from_revision_ids(None,
 
409
        merger = _mod_merge.Merger.from_revision_ids(
377
410
            this_tree, 'rev3b', 'rev2b', other_tree.branch)
378
411
        merger.merge_type = _mod_merge.Merge3Merger
379
412
        merger.do_merge()
384
417
                             '>>>>>>> MERGE-SOURCE\n',
385
418
                             'this/file')
386
419
 
 
420
    def test_merge_reverse_revision_range(self):
 
421
        tree = self.make_branch_and_tree(".")
 
422
        tree.lock_write()
 
423
        self.addCleanup(tree.unlock)
 
424
        self.build_tree(['a'])
 
425
        tree.add('a')
 
426
        first_rev = tree.commit("added a")
 
427
        merger = _mod_merge.Merger.from_revision_ids(tree,
 
428
                                          _mod_revision.NULL_REVISION,
 
429
                                          first_rev)
 
430
        merger.merge_type = _mod_merge.Merge3Merger
 
431
        merger.interesting_files = 'a'
 
432
        conflict_count = merger.do_merge()
 
433
        self.assertEqual(0, conflict_count)
 
434
 
 
435
        self.assertPathDoesNotExist("a")
 
436
        tree.revert()
 
437
        self.assertPathExists("a")
 
438
 
387
439
    def test_make_merger(self):
388
440
        this_tree = self.make_branch_and_tree('this')
389
441
        this_tree.commit('rev1', rev_id='rev1')
390
 
        other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
 
442
        other_tree = this_tree.controldir.sprout('other').open_workingtree()
391
443
        this_tree.commit('rev2', rev_id='rev2a')
392
444
        other_tree.commit('rev2', rev_id='rev2b')
393
445
        this_tree.lock_write()
394
446
        self.addCleanup(this_tree.unlock)
395
 
        merger = _mod_merge.Merger.from_revision_ids(None,
 
447
        merger = _mod_merge.Merger.from_revision_ids(
396
448
            this_tree, 'rev2b', other_branch=other_tree.branch)
397
449
        merger.merge_type = _mod_merge.Merge3Merger
398
450
        tree_merger = merger.make_merger()
399
451
        self.assertIs(_mod_merge.Merge3Merger, tree_merger.__class__)
400
 
        self.assertEqual('rev2b', tree_merger.other_tree.get_revision_id())
401
 
        self.assertEqual('rev1', tree_merger.base_tree.get_revision_id())
 
452
        self.assertEqual('rev2b',
 
453
            tree_merger.other_tree.get_revision_id())
 
454
        self.assertEqual('rev1',
 
455
            tree_merger.base_tree.get_revision_id())
 
456
        self.assertEqual(other_tree.branch, tree_merger.other_branch)
402
457
 
403
458
    def test_make_preview_transform(self):
404
459
        this_tree = self.make_branch_and_tree('this')
405
460
        self.build_tree_contents([('this/file', '1\n')])
406
461
        this_tree.add('file', 'file-id')
407
462
        this_tree.commit('rev1', rev_id='rev1')
408
 
        other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
 
463
        other_tree = this_tree.controldir.sprout('other').open_workingtree()
409
464
        self.build_tree_contents([('this/file', '1\n2a\n')])
410
465
        this_tree.commit('rev2', rev_id='rev2a')
411
466
        self.build_tree_contents([('other/file', '2b\n1\n')])
412
467
        other_tree.commit('rev2', rev_id='rev2b')
413
468
        this_tree.lock_write()
414
469
        self.addCleanup(this_tree.unlock)
415
 
        merger = _mod_merge.Merger.from_revision_ids(None,
 
470
        merger = _mod_merge.Merger.from_revision_ids(
416
471
            this_tree, 'rev2b', other_branch=other_tree.branch)
417
472
        merger.merge_type = _mod_merge.Merge3Merger
418
473
        tree_merger = merger.make_merger()
419
474
        tt = tree_merger.make_preview_transform()
420
475
        self.addCleanup(tt.finalize)
421
476
        preview_tree = tt.get_preview_tree()
422
 
        tree_file = this_tree.get_file('file-id')
 
477
        tree_file = this_tree.get_file('file')
423
478
        try:
424
479
            self.assertEqual('1\n2a\n', tree_file.read())
425
480
        finally:
426
481
            tree_file.close()
427
 
        preview_file = preview_tree.get_file('file-id')
 
482
        preview_file = preview_tree.get_file('file')
428
483
        try:
429
484
            self.assertEqual('2b\n1\n2a\n', preview_file.read())
430
485
        finally:
435
490
        self.build_tree_contents([('this/file', '1\n')])
436
491
        this_tree.add('file', 'file-id')
437
492
        this_tree.commit('rev1', rev_id='rev1')
438
 
        other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
 
493
        other_tree = this_tree.controldir.sprout('other').open_workingtree()
439
494
        self.build_tree_contents([('this/file', '1\n2a\n')])
440
495
        this_tree.commit('rev2', rev_id='rev2a')
441
496
        self.build_tree_contents([('other/file', '2b\n1\n')])
442
497
        other_tree.commit('rev2', rev_id='rev2b')
443
498
        this_tree.lock_write()
444
499
        self.addCleanup(this_tree.unlock)
445
 
        merger = _mod_merge.Merger.from_revision_ids(None,
 
500
        merger = _mod_merge.Merger.from_revision_ids(
446
501
            this_tree, 'rev2b', other_branch=other_tree.branch)
447
502
        merger.merge_type = _mod_merge.Merge3Merger
448
503
        tree_merger = merger.make_merger()
449
504
        tt = tree_merger.do_merge()
450
 
        tree_file = this_tree.get_file('file-id')
 
505
        tree_file = this_tree.get_file('file')
451
506
        try:
452
507
            self.assertEqual('2b\n1\n2a\n', tree_file.read())
453
508
        finally:
454
509
            tree_file.close()
455
510
 
 
511
    def test_merge_require_tree_root(self):
 
512
        tree = self.make_branch_and_tree(".")
 
513
        tree.lock_write()
 
514
        self.addCleanup(tree.unlock)
 
515
        self.build_tree(['a'])
 
516
        tree.add('a')
 
517
        first_rev = tree.commit("added a")
 
518
        old_root_id = tree.get_root_id()
 
519
        merger = _mod_merge.Merger.from_revision_ids(tree,
 
520
                                          _mod_revision.NULL_REVISION,
 
521
                                          first_rev)
 
522
        merger.merge_type = _mod_merge.Merge3Merger
 
523
        conflict_count = merger.do_merge()
 
524
        self.assertEqual(0, conflict_count)
 
525
        self.assertEqual({old_root_id}, tree.all_file_ids())
 
526
        tree.set_parent_ids([])
 
527
 
456
528
    def test_merge_add_into_deleted_root(self):
457
529
        # Yes, people actually do this.  And report bugs if it breaks.
458
530
        source = self.make_branch_and_tree('source', format='rich-root-pack')
459
531
        self.build_tree(['source/foo/'])
460
532
        source.add('foo', 'foo-id')
461
533
        source.commit('Add foo')
462
 
        target = source.bzrdir.sprout('target').open_workingtree()
 
534
        target = source.controldir.sprout('target').open_workingtree()
463
535
        subtree = target.extract('foo-id')
464
536
        subtree.commit('Delete root')
465
537
        self.build_tree(['source/bar'])
476
548
        self.build_tree(['target/bla'])
477
549
        target.add('bla')
478
550
        target.commit('Add bla')
479
 
        nested = source.bzrdir.sprout('target/subtree').open_workingtree()
 
551
        nested = source.controldir.sprout('target/subtree').open_workingtree()
480
552
        target.subsume(nested)
481
553
        target.commit('Join nested')
482
554
        self.build_tree(['source/bar'])
489
561
class TestPlanMerge(TestCaseWithMemoryTransport):
490
562
 
491
563
    def setUp(self):
492
 
        TestCaseWithMemoryTransport.setUp(self)
 
564
        super(TestPlanMerge, self).setUp()
493
565
        mapper = versionedfile.PrefixMapper()
494
566
        factory = knit.make_file_factory(True, mapper)
495
567
        self.vf = factory(self.get_transport())
975
1047
 
976
1048
    def assertPruneTails(self, pruned_map, tails, parent_map):
977
1049
        child_map = {}
978
 
        for key, parent_keys in parent_map.iteritems():
 
1050
        for key, parent_keys in parent_map.items():
979
1051
            child_map.setdefault(key, [])
980
1052
            for pkey in parent_keys:
981
1053
                child_map.setdefault(pkey, []).append(key)
1171
1243
        #  B C
1172
1244
        #
1173
1245
        builder = self.get_builder()
1174
 
        builder.build_snapshot('A-id', None,
1175
 
            [('add', ('', None, 'directory', None))])
1176
 
        builder.build_snapshot('C-id', ['A-id'], [])
1177
 
        builder.build_snapshot('B-id', ['A-id'], [])
 
1246
        builder.build_snapshot(None,
 
1247
            [('add', ('', None, 'directory', None))],
 
1248
            revision_id='A-id' )
 
1249
        builder.build_snapshot(['A-id'], [], revision_id='C-id')
 
1250
        builder.build_snapshot(['A-id'], [], revision_id='B-id')
1178
1251
        return builder
1179
1252
 
1180
1253
    def setup_criss_cross_graph(self):
1188
1261
        # |X|
1189
1262
        # D E
1190
1263
        builder = self.setup_simple_graph()
1191
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1192
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
 
1264
        builder.build_snapshot(['C-id', 'B-id'], [], revision_id='E-id')
 
1265
        builder.build_snapshot(['B-id', 'C-id'], [], revision_id='D-id')
1193
1266
        return builder
1194
1267
 
1195
1268
    def make_Merger(self, builder, other_revision_id,
1198
1271
        mem_tree = memorytree.MemoryTree.create_on_branch(builder.get_branch())
1199
1272
        mem_tree.lock_write()
1200
1273
        self.addCleanup(mem_tree.unlock)
1201
 
        merger = _mod_merge.Merger.from_revision_ids(None,
 
1274
        merger = _mod_merge.Merger.from_revision_ids(
1202
1275
            mem_tree, other_revision_id)
1203
1276
        merger.set_interesting_files(interesting_files)
1204
1277
        # It seems there is no matching function for set_interesting_ids
1244
1317
        self.assertEqual(['B-id', 'C-id'], [t.get_revision_id()
1245
1318
                                            for t in merger._lca_trees])
1246
1319
        # If we swap the order, we should get a different lca order
1247
 
        builder.build_snapshot('F-id', ['E-id'], [])
 
1320
        builder.build_snapshot(['E-id'], [], revision_id='F-id')
1248
1321
        merger = self.make_Merger(builder, 'D-id')
1249
1322
        self.assertEqual(['C-id', 'B-id'], [t.get_revision_id()
1250
1323
                                            for t in merger._lca_trees])
1260
1333
        #    \|   |/
1261
1334
        #     G   H
1262
1335
        builder = self.setup_criss_cross_graph()
1263
 
        builder.build_snapshot('F-id', ['A-id'], [])
1264
 
        builder.build_snapshot('H-id', ['E-id', 'F-id'], [])
1265
 
        builder.build_snapshot('G-id', ['D-id', 'F-id'], [])
 
1336
        builder.build_snapshot(['A-id'], [], revision_id='F-id')
 
1337
        builder.build_snapshot(['E-id', 'F-id'], [], revision_id='H-id')
 
1338
        builder.build_snapshot(['D-id', 'F-id'], [], revision_id='G-id')
1266
1339
        merger = self.make_Merger(builder, 'H-id')
1267
1340
        self.assertEqual(['B-id', 'C-id', 'F-id'],
1268
1341
                         [t.get_revision_id() for t in merger._lca_trees])
1269
1342
 
 
1343
    def test_find_base_new_root_criss_cross(self):
 
1344
        # A   B
 
1345
        # |\ /|
 
1346
        # | X |
 
1347
        # |/ \|
 
1348
        # C   D
 
1349
        builder = self.get_builder()
 
1350
        builder.build_snapshot(None,
 
1351
            [('add', ('', None, 'directory', None))],
 
1352
            revision_id='A-id')
 
1353
        builder.build_snapshot([],
 
1354
            [('add', ('', None, 'directory', None))],
 
1355
            revision_id='B-id')
 
1356
        builder.build_snapshot(['A-id', 'B-id'], [], revision_id='D-id')
 
1357
        builder.build_snapshot(['A-id', 'B-id'], [], revision_id='C-id')
 
1358
        merger = self.make_Merger(builder, 'D-id')
 
1359
        self.assertEqual('A-id', merger.base_rev_id)
 
1360
        self.assertTrue(merger._is_criss_cross)
 
1361
        self.assertEqual(['A-id', 'B-id'], [t.get_revision_id()
 
1362
                                            for t in merger._lca_trees])
 
1363
 
1270
1364
    def test_no_criss_cross_passed_to_merge_type(self):
1271
1365
        class LCATreesMerger(LoggingMerger):
1272
1366
            supports_lca_trees = True
1314
1408
 
1315
1409
    def test_simple(self):
1316
1410
        builder = self.get_builder()
1317
 
        builder.build_snapshot('A-id', None,
 
1411
        builder.build_snapshot(None,
1318
1412
            [('add', (u'', 'a-root-id', 'directory', None)),
1319
 
             ('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))])
1320
 
        builder.build_snapshot('C-id', ['A-id'],
1321
 
            [('modify', ('a-id', 'a\nb\nC\nc\n'))])
1322
 
        builder.build_snapshot('B-id', ['A-id'],
1323
 
            [('modify', ('a-id', 'a\nB\nb\nc\n'))])
1324
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'],
1325
 
            [('modify', ('a-id', 'a\nB\nb\nC\nc\nE\n'))])
1326
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'],
1327
 
            [('modify', ('a-id', 'a\nB\nb\nC\nc\n'))])
 
1413
             ('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))],
 
1414
            revision_id='A-id')
 
1415
        builder.build_snapshot(['A-id'],
 
1416
            [('modify', ('a-id', 'a\nb\nC\nc\n'))],
 
1417
            revision_id='C-id')
 
1418
        builder.build_snapshot(['A-id'],
 
1419
            [('modify', ('a-id', 'a\nB\nb\nc\n'))],
 
1420
            revision_id='B-id')
 
1421
        builder.build_snapshot(['C-id', 'B-id'],
 
1422
            [('modify', ('a-id', 'a\nB\nb\nC\nc\nE\n'))],
 
1423
            revision_id='E-id')
 
1424
        builder.build_snapshot(['B-id', 'C-id'],
 
1425
            [('modify', ('a-id', 'a\nB\nb\nC\nc\n'))],
 
1426
            revision_id='D-id', )
1328
1427
        merge_obj = self.make_merge_obj(builder, 'E-id')
1329
1428
 
1330
1429
        self.assertEqual(['B-id', 'C-id'], [t.get_revision_id()
1354
1453
        #            G modifies 'bar'
1355
1454
 
1356
1455
        builder = self.get_builder()
1357
 
        builder.build_snapshot('A-id', None,
1358
 
            [('add', (u'', 'a-root-id', 'directory', None))])
1359
 
        builder.build_snapshot('B-id', ['A-id'],
1360
 
            [('add', (u'foo', 'foo-id', 'file', 'a\nb\nc\n'))])
1361
 
        builder.build_snapshot('C-id', ['A-id'],
1362
 
            [('add', (u'bar', 'bar-id', 'file', 'd\ne\nf\n'))])
1363
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'],
1364
 
            [('add', (u'bar', 'bar-id', 'file', 'd\ne\nf\n'))])
1365
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'],
1366
 
            [('add', (u'foo', 'foo-id', 'file', 'a\nb\nc\n'))])
1367
 
        builder.build_snapshot('G-id', ['E-id', 'D-id'],
1368
 
            [('modify', (u'bar-id', 'd\ne\nf\nG\n'))])
1369
 
        builder.build_snapshot('F-id', ['D-id', 'E-id'], [])
 
1456
        builder.build_snapshot(None,
 
1457
            [('add', (u'', 'a-root-id', 'directory', None))],
 
1458
            revision_id='A-id')
 
1459
        builder.build_snapshot(['A-id'],
 
1460
            [('add', (u'foo', 'foo-id', 'file', 'a\nb\nc\n'))],
 
1461
            revision_id='B-id')
 
1462
        builder.build_snapshot(['A-id'],
 
1463
            [('add', (u'bar', 'bar-id', 'file', 'd\ne\nf\n'))],
 
1464
            revision_id='C-id')
 
1465
        builder.build_snapshot(['B-id', 'C-id'],
 
1466
            [('add', (u'bar', 'bar-id', 'file', 'd\ne\nf\n'))],
 
1467
            revision_id='D-id')
 
1468
        builder.build_snapshot(['C-id', 'B-id'],
 
1469
            [('add', (u'foo', 'foo-id', 'file', 'a\nb\nc\n'))],
 
1470
            revision_id='E-id')
 
1471
        builder.build_snapshot(['E-id', 'D-id'],
 
1472
            [('modify', (u'bar-id', 'd\ne\nf\nG\n'))],
 
1473
            revision_id='G-id')
 
1474
        builder.build_snapshot(['D-id', 'E-id'], [], revision_id='F-id')
1370
1475
        merge_obj = self.make_merge_obj(builder, 'G-id')
1371
1476
 
1372
1477
        self.assertEqual(['D-id', 'E-id'], [t.get_revision_id()
1382
1487
 
1383
1488
    def test_not_in_this(self):
1384
1489
        builder = self.get_builder()
1385
 
        builder.build_snapshot('A-id', None,
 
1490
        builder.build_snapshot(None,
1386
1491
            [('add', (u'', 'a-root-id', 'directory', None)),
1387
 
             ('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))])
1388
 
        builder.build_snapshot('B-id', ['A-id'],
1389
 
            [('modify', ('a-id', 'a\nB\nb\nc\n'))])
1390
 
        builder.build_snapshot('C-id', ['A-id'],
1391
 
            [('modify', ('a-id', 'a\nb\nC\nc\n'))])
1392
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'],
1393
 
            [('modify', ('a-id', 'a\nB\nb\nC\nc\nE\n'))])
1394
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'],
1395
 
            [('unversion', 'a-id')])
 
1492
             ('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))],
 
1493
            revision_id='A-id')
 
1494
        builder.build_snapshot(['A-id'],
 
1495
            [('modify', ('a-id', 'a\nB\nb\nc\n'))],
 
1496
            revision_id='B-id')
 
1497
        builder.build_snapshot(['A-id'],
 
1498
            [('modify', ('a-id', 'a\nb\nC\nc\n'))],
 
1499
            revision_id='C-id')
 
1500
        builder.build_snapshot(['C-id', 'B-id'],
 
1501
            [('modify', ('a-id', 'a\nB\nb\nC\nc\nE\n'))],
 
1502
            revision_id='E-id')
 
1503
        builder.build_snapshot(['B-id', 'C-id'],
 
1504
            [('unversion', 'a-id')],
 
1505
            revision_id='D-id')
1396
1506
        merge_obj = self.make_merge_obj(builder, 'E-id')
1397
1507
 
1398
1508
        self.assertEqual(['B-id', 'C-id'], [t.get_revision_id()
1414
1524
        #   |X|
1415
1525
        #   D E # D and E both have the file, unchanged from C
1416
1526
        builder = self.get_builder()
1417
 
        builder.build_snapshot('A-id', None,
1418
 
            [('add', (u'', 'a-root-id', 'directory', None))])
1419
 
        builder.build_snapshot('B-id', ['A-id'], [])
1420
 
        builder.build_snapshot('C-id', ['A-id'],
1421
 
            [('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))])
1422
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'], []) # Inherited from C
1423
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'], # Merged from C
1424
 
            [('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))])
 
1527
        builder.build_snapshot(None,
 
1528
            [('add', (u'', 'a-root-id', 'directory', None))],
 
1529
            revision_id='A-id')
 
1530
        builder.build_snapshot(['A-id'], [], revision_id='B-id')
 
1531
        builder.build_snapshot(['A-id'],
 
1532
            [('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))],
 
1533
            revision_id='C-id')
 
1534
        builder.build_snapshot(['C-id', 'B-id'],
 
1535
                               [], revision_id='E-id') # Inherited from C
 
1536
        builder.build_snapshot(['B-id', 'C-id'], # Merged from C
 
1537
            [('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))],
 
1538
            revision_id='D-id')
1425
1539
        merge_obj = self.make_merge_obj(builder, 'E-id')
1426
1540
 
1427
1541
        self.assertEqual(['B-id', 'C-id'], [t.get_revision_id()
1433
1547
 
1434
1548
    def test_not_in_other(self):
1435
1549
        builder = self.get_builder()
1436
 
        builder.build_snapshot('A-id', None,
 
1550
        builder.build_snapshot(None,
1437
1551
            [('add', (u'', 'a-root-id', 'directory', None)),
1438
 
             ('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))])
1439
 
        builder.build_snapshot('B-id', ['A-id'], [])
1440
 
        builder.build_snapshot('C-id', ['A-id'], [])
1441
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'],
1442
 
            [('unversion', 'a-id')])
1443
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
 
1552
             ('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))],
 
1553
            revision_id='A-id')
 
1554
        builder.build_snapshot(['A-id'], [], revision_id='B-id')
 
1555
        builder.build_snapshot(['A-id'], [], revision_id='C-id')
 
1556
        builder.build_snapshot(
 
1557
                ['C-id', 'B-id'],
 
1558
                [('unversion', 'a-id')], revision_id='E-id')
 
1559
        builder.build_snapshot(['B-id', 'C-id'], [], revision_id='D-id')
1444
1560
        merge_obj = self.make_merge_obj(builder, 'E-id')
1445
1561
 
1446
1562
        entries = list(merge_obj._entries_lca())
1464
1580
        #   C => E, no changes
1465
1581
        # D would then win 'cleanly' and no record would be given
1466
1582
        builder = self.get_builder()
1467
 
        builder.build_snapshot('A-id', None,
 
1583
        builder.build_snapshot(None,
1468
1584
            [('add', (u'', 'a-root-id', 'directory', None)),
1469
 
             ('add', (u'foo', 'foo-id', 'file', 'content\n'))])
1470
 
        builder.build_snapshot('B-id', ['A-id'], [])
1471
 
        builder.build_snapshot('C-id', ['A-id'],
1472
 
            [('unversion', 'foo-id')])
1473
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1474
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
 
1585
             ('add', (u'foo', 'foo-id', 'file', 'content\n'))],
 
1586
            revision_id='A-id')
 
1587
        builder.build_snapshot(['A-id'], [], revision_id='B-id')
 
1588
        builder.build_snapshot(['A-id'],
 
1589
            [('unversion', 'foo-id')], revision_id='C-id')
 
1590
        builder.build_snapshot(['C-id', 'B-id'], [], revision_id='E-id')
 
1591
        builder.build_snapshot(['B-id', 'C-id'], [], revision_id='D-id')
1475
1592
        merge_obj = self.make_merge_obj(builder, 'E-id')
1476
1593
 
1477
1594
        entries = list(merge_obj._entries_lca())
1493
1610
        # In this case, we have a conflict of how the changes were resolved. E
1494
1611
        # picked C and D picked B, so we should issue a conflict
1495
1612
        builder = self.get_builder()
1496
 
        builder.build_snapshot('A-id', None,
 
1613
        builder.build_snapshot(None,
1497
1614
            [('add', (u'', 'a-root-id', 'directory', None)),
1498
 
             ('add', (u'foo', 'foo-id', 'file', 'content\n'))])
1499
 
        builder.build_snapshot('B-id', ['A-id'], [
1500
 
            ('modify', ('foo-id', 'new-content\n'))])
1501
 
        builder.build_snapshot('C-id', ['A-id'],
1502
 
            [('unversion', 'foo-id')])
1503
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1504
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
 
1615
             ('add', (u'foo', 'foo-id', 'file', 'content\n'))],
 
1616
            revision_id='A-id')
 
1617
        builder.build_snapshot(['A-id'], [
 
1618
            ('modify', ('foo-id', 'new-content\n'))],
 
1619
            revision_id='B-id')
 
1620
        builder.build_snapshot(['A-id'],
 
1621
            [('unversion', 'foo-id')],
 
1622
            revision_id='C-id')
 
1623
        builder.build_snapshot(['C-id', 'B-id'], [], revision_id='E-id')
 
1624
        builder.build_snapshot(['B-id', 'C-id'], [], revision_id='D-id')
1505
1625
        merge_obj = self.make_merge_obj(builder, 'E-id')
1506
1626
 
1507
1627
        entries = list(merge_obj._entries_lca())
1529
1649
        #   A => C, add file, thus C supersedes B
1530
1650
        #   w/ C=BASE, D=THIS, E=OTHER we have 'happy convergence'
1531
1651
        builder = self.get_builder()
1532
 
        builder.build_snapshot('A-id', None,
1533
 
            [('add', (u'', 'a-root-id', 'directory', None))])
1534
 
        builder.build_snapshot('B-id', ['A-id'], [])
1535
 
        builder.build_snapshot('C-id', ['A-id'],
1536
 
            [('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))])
1537
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'],
1538
 
            [('unversion', 'a-id')])
1539
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
 
1652
        builder.build_snapshot(None,
 
1653
            [('add', (u'', 'a-root-id', 'directory', None))],
 
1654
            revision_id='A-id')
 
1655
        builder.build_snapshot(['A-id'], [], revision_id='B-id')
 
1656
        builder.build_snapshot(['A-id'],
 
1657
            [('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))],
 
1658
            revision_id='C-id')
 
1659
        builder.build_snapshot(['C-id', 'B-id'],
 
1660
            [('unversion', 'a-id')],
 
1661
            revision_id='E-id')
 
1662
        builder.build_snapshot(['B-id', 'C-id'], [], revision_id='D-id')
1540
1663
        merge_obj = self.make_merge_obj(builder, 'E-id')
1541
1664
 
1542
1665
        entries = list(merge_obj._entries_lca())
1544
1667
 
1545
1668
    def test_only_in_other(self):
1546
1669
        builder = self.get_builder()
1547
 
        builder.build_snapshot('A-id', None,
1548
 
            [('add', (u'', 'a-root-id', 'directory', None))])
1549
 
        builder.build_snapshot('B-id', ['A-id'], [])
1550
 
        builder.build_snapshot('C-id', ['A-id'], [])
1551
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'],
1552
 
            [('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))])
1553
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
 
1670
        builder.build_snapshot(None,
 
1671
            [('add', (u'', 'a-root-id', 'directory', None))],
 
1672
            revision_id='A-id')
 
1673
        builder.build_snapshot(['A-id'], [], revision_id='B-id')
 
1674
        builder.build_snapshot(['A-id'], [], revision_id='C-id')
 
1675
        builder.build_snapshot(['C-id', 'B-id'],
 
1676
            [('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))],
 
1677
            revision_id='E-id')
 
1678
        builder.build_snapshot(['B-id', 'C-id'], [], revision_id='D-id')
1554
1679
        merge_obj = self.make_merge_obj(builder, 'E-id')
1555
1680
 
1556
1681
        entries = list(merge_obj._entries_lca())
1576
1701
        #   though its LCAs disagree. This is because the modification in E
1577
1702
        #   completely supersedes the value in D.
1578
1703
        builder = self.get_builder()
1579
 
        builder.build_snapshot('A-id', None,
 
1704
        builder.build_snapshot(None,
1580
1705
            [('add', (u'', 'a-root-id', 'directory', None)),
1581
 
             ('add', (u'foo', 'foo-id', 'file', 'A content\n'))])
1582
 
        builder.build_snapshot('C-id', ['A-id'], [])
1583
 
        builder.build_snapshot('B-id', ['A-id'],
1584
 
            [('modify', ('foo-id', 'B content\n'))])
1585
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1586
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'],
1587
 
            [('modify', ('foo-id', 'E content\n'))])
1588
 
        builder.build_snapshot('G-id', ['E-id', 'D-id'], [])
1589
 
        builder.build_snapshot('F-id', ['D-id', 'E-id'],
1590
 
            [('modify', ('foo-id', 'F content\n'))])
 
1706
             ('add', (u'foo', 'foo-id', 'file', 'A content\n'))],
 
1707
            revision_id='A-id')
 
1708
        builder.build_snapshot(['A-id'], [], revision_id='C-id')
 
1709
        builder.build_snapshot(['A-id'],
 
1710
            [('modify', ('foo-id', 'B content\n'))],
 
1711
            revision_id='B-id')
 
1712
        builder.build_snapshot(['B-id', 'C-id'], [], revision_id='D-id')
 
1713
        builder.build_snapshot(['C-id', 'B-id'],
 
1714
            [('modify', ('foo-id', 'E content\n'))],
 
1715
            revision_id='E-id')
 
1716
        builder.build_snapshot(['E-id', 'D-id'], [], revision_id='G-id')
 
1717
        builder.build_snapshot(['D-id', 'E-id'],
 
1718
            [('modify', ('foo-id', 'F content\n'))],
 
1719
            revision_id='F-id')
1591
1720
        merge_obj = self.make_merge_obj(builder, 'G-id')
1592
1721
 
1593
1722
        self.assertEqual([], list(merge_obj._entries_lca()))
1622
1751
        # aren't supporting it yet.
1623
1752
        #
1624
1753
        builder = self.get_builder()
1625
 
        builder.build_snapshot('A-id', None,
 
1754
        builder.build_snapshot(None,
1626
1755
            [('add', (u'', 'a-root-id', 'directory', None)),
1627
 
             ('add', (u'foo', 'foo-id', 'file', 'A content\n'))])
1628
 
        builder.build_snapshot('C-id', ['A-id'], [])
1629
 
        builder.build_snapshot('B-id', ['A-id'],
1630
 
            [('rename', ('foo', 'bar'))])
1631
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1632
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'],
1633
 
            [('rename', ('foo', 'bing'))]) # override to bing
1634
 
        builder.build_snapshot('G-id', ['E-id', 'D-id'],
1635
 
            [('rename', ('bing', 'barry'))]) # override to barry
1636
 
        builder.build_snapshot('F-id', ['D-id', 'E-id'],
1637
 
            [('rename', ('bar', 'bing'))]) # Merge in E's change
 
1756
             ('add', (u'foo', 'foo-id', 'file', 'A content\n'))],
 
1757
            revision_id='A-id')
 
1758
        builder.build_snapshot(['A-id'], [], revision_id='C-id')
 
1759
        builder.build_snapshot(['A-id'],
 
1760
            [('rename', ('foo', 'bar'))],
 
1761
            revision_id='B-id')
 
1762
        builder.build_snapshot(['B-id', 'C-id'], [], revision_id='D-id')
 
1763
        builder.build_snapshot(['C-id', 'B-id'],
 
1764
            [('rename', ('foo', 'bing'))],
 
1765
            revision_id='E-id') # override to bing
 
1766
        builder.build_snapshot(['E-id', 'D-id'],
 
1767
            [('rename', ('bing', 'barry'))],
 
1768
            revision_id='G-id') # override to barry
 
1769
        builder.build_snapshot(['D-id', 'E-id'],
 
1770
            [('rename', ('bar', 'bing'))],
 
1771
            revision_id='F-id') # Merge in E's change
1638
1772
        merge_obj = self.make_merge_obj(builder, 'G-id')
1639
1773
 
1640
1774
        self.expectFailure("We don't do an actual heads() check on lca values,"
1655
1789
        # be pruned from the LCAs, even though it was newly introduced by E
1656
1790
        # (superseding B).
1657
1791
        builder = self.get_builder()
1658
 
        builder.build_snapshot('A-id', None,
 
1792
        builder.build_snapshot(None,
1659
1793
            [('add', (u'', 'a-root-id', 'directory', None)),
1660
 
             ('add', (u'foo', 'foo-id', 'file', 'A content\n'))])
1661
 
        builder.build_snapshot('C-id', ['A-id'], [])
1662
 
        builder.build_snapshot('B-id', ['A-id'],
1663
 
            [('rename', ('foo', 'bar'))])
1664
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1665
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1666
 
        builder.build_snapshot('G-id', ['E-id', 'D-id'],
1667
 
            [('rename', ('foo', 'bar'))])
1668
 
        builder.build_snapshot('F-id', ['D-id', 'E-id'],
1669
 
            [('rename', ('bar', 'bing'))]) # should end up conflicting
 
1794
             ('add', (u'foo', 'foo-id', 'file', 'A content\n'))],
 
1795
            revision_id='A-id')
 
1796
        builder.build_snapshot(['A-id'], [], revision_id='C-id')
 
1797
        builder.build_snapshot(['A-id'],
 
1798
            [('rename', ('foo', 'bar'))],
 
1799
            revision_id='B-id')
 
1800
        builder.build_snapshot(['B-id', 'C-id'], [], revision_id='D-id')
 
1801
        builder.build_snapshot(['C-id', 'B-id'], [], revision_id='E-id')
 
1802
        builder.build_snapshot(['E-id', 'D-id'],
 
1803
            [('rename', ('foo', 'bar'))],
 
1804
            revision_id='G-id')
 
1805
        builder.build_snapshot(['D-id', 'E-id'],
 
1806
            [('rename', ('bar', 'bing'))],
 
1807
            revision_id='F-id') # should end up conflicting
1670
1808
        merge_obj = self.make_merge_obj(builder, 'G-id')
1671
1809
 
1672
1810
        entries = list(merge_obj._entries_lca())
1688
1826
        #       D E  D reverts to B, E reverts to C
1689
1827
        # This should conflict
1690
1828
        builder = self.get_builder()
1691
 
        builder.build_snapshot('A-id', None,
 
1829
        builder.build_snapshot(None,
1692
1830
            [('add', (u'', 'a-root-id', 'directory', None)),
1693
 
             ('add', (u'foo', 'foo-id', 'file', 'A content\n'))])
1694
 
        builder.build_snapshot('B-id', ['A-id'],
1695
 
            [('modify', ('foo-id', 'B content\n'))])
1696
 
        builder.build_snapshot('C-id', ['A-id'],
1697
 
            [('modify', ('foo-id', 'C content\n'))])
1698
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1699
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
 
1831
             ('add', (u'foo', 'foo-id', 'file', 'A content\n'))],
 
1832
            revision_id='A-id')
 
1833
        builder.build_snapshot(['A-id'],
 
1834
            [('modify', ('foo-id', 'B content\n'))],
 
1835
            revision_id='B-id')
 
1836
        builder.build_snapshot(['A-id'],
 
1837
            [('modify', ('foo-id', 'C content\n'))],
 
1838
            revision_id='C-id')
 
1839
        builder.build_snapshot(['C-id', 'B-id'], [], revision_id='E-id')
 
1840
        builder.build_snapshot(['B-id', 'C-id'], [], revision_id='D-id')
1700
1841
        merge_obj = self.make_merge_obj(builder, 'E-id')
1701
1842
 
1702
1843
        entries = list(merge_obj._entries_lca())
1719
1860
        # We need to emit an entry for 'foo', because D & E differed on the
1720
1861
        # merge resolution
1721
1862
        builder = self.get_builder()
1722
 
        builder.build_snapshot('A-id', None,
 
1863
        builder.build_snapshot(None,
1723
1864
            [('add', (u'', 'a-root-id', 'directory', None)),
1724
 
             ('add', (u'foo', 'foo-id', 'file', 'A content\n'))])
1725
 
        builder.build_snapshot('B-id', ['A-id'],
1726
 
            [('modify', ('foo-id', 'B content\n'))])
1727
 
        builder.build_snapshot('C-id', ['A-id'],
1728
 
            [('modify', ('foo-id', 'C content\n'))])
1729
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1730
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1731
 
        builder.build_snapshot('F-id', ['D-id'],
1732
 
            [('modify', ('foo-id', 'F content\n'))])
 
1865
             ('add', (u'foo', 'foo-id', 'file', 'A content\n'))],
 
1866
            revision_id='A-id')
 
1867
        builder.build_snapshot(['A-id'],
 
1868
            [('modify', ('foo-id', 'B content\n'))],
 
1869
            revision_id='B-id')
 
1870
        builder.build_snapshot(['A-id'],
 
1871
            [('modify', ('foo-id', 'C content\n'))],
 
1872
            revision_id='C-id', )
 
1873
        builder.build_snapshot(['C-id', 'B-id'], [], revision_id='E-id')
 
1874
        builder.build_snapshot(['B-id', 'C-id'], [], revision_id='D-id')
 
1875
        builder.build_snapshot(['D-id'],
 
1876
            [('modify', ('foo-id', 'F content\n'))],
 
1877
            revision_id='F-id')
1733
1878
        merge_obj = self.make_merge_obj(builder, 'E-id')
1734
1879
 
1735
1880
        entries = list(merge_obj._entries_lca())
1755
1900
        # We need to conflict.
1756
1901
 
1757
1902
        builder = self.get_builder()
1758
 
        builder.build_snapshot('A-id', None,
 
1903
        builder.build_snapshot(None,
1759
1904
            [('add', (u'', 'a-root-id', 'directory', None)),
1760
 
             ('add', (u'foo', 'foo-id', 'file', 'A content\n'))])
1761
 
        builder.build_snapshot('B-id', ['A-id'],
1762
 
            [('modify', ('foo-id', 'B content\n'))])
1763
 
        builder.build_snapshot('C-id', ['A-id'],
1764
 
            [('modify', ('foo-id', 'C content\n'))])
1765
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1766
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'],
1767
 
            [('modify', ('foo-id', 'C content\n'))]) # Same as E
1768
 
        builder.build_snapshot('F-id', ['D-id'],
1769
 
            [('modify', ('foo-id', 'F content\n'))])
 
1905
             ('add', (u'foo', 'foo-id', 'file', 'A content\n'))],
 
1906
            revision_id='A-id')
 
1907
        builder.build_snapshot(['A-id'],
 
1908
            [('modify', ('foo-id', 'B content\n'))],
 
1909
            revision_id='B-id')
 
1910
        builder.build_snapshot(['A-id'],
 
1911
            [('modify', ('foo-id', 'C content\n'))],
 
1912
            revision_id='C-id')
 
1913
        builder.build_snapshot(['C-id', 'B-id'], [], revision_id='E-id')
 
1914
        builder.build_snapshot(['B-id', 'C-id'],
 
1915
            [('modify', ('foo-id', 'C content\n'))],
 
1916
            revision_id='D-id') # Same as E
 
1917
        builder.build_snapshot(['D-id'],
 
1918
            [('modify', ('foo-id', 'F content\n'))],
 
1919
            revision_id='F-id')
1770
1920
        merge_obj = self.make_merge_obj(builder, 'E-id')
1771
1921
 
1772
1922
        entries = list(merge_obj._entries_lca())
1776
1926
 
1777
1927
    def test_only_path_changed(self):
1778
1928
        builder = self.get_builder()
1779
 
        builder.build_snapshot('A-id', None,
 
1929
        builder.build_snapshot(None,
1780
1930
            [('add', (u'', 'a-root-id', 'directory', None)),
1781
 
             ('add', (u'a', 'a-id', 'file', 'content\n'))])
1782
 
        builder.build_snapshot('B-id', ['A-id'], [])
1783
 
        builder.build_snapshot('C-id', ['A-id'], [])
1784
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'],
1785
 
            [('rename', (u'a', u'b'))])
1786
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
 
1931
             ('add', (u'a', 'a-id', 'file', 'content\n'))],
 
1932
            revision_id='A-id')
 
1933
        builder.build_snapshot(['A-id'], [], revision_id='B-id')
 
1934
        builder.build_snapshot(['A-id'], [], revision_id='C-id')
 
1935
        builder.build_snapshot(['C-id', 'B-id'],
 
1936
            [('rename', (u'a', u'b'))],
 
1937
            revision_id='E-id')
 
1938
        builder.build_snapshot(['B-id', 'C-id'], [], revision_id='D-id')
1787
1939
        merge_obj = self.make_merge_obj(builder, 'E-id')
1788
1940
        entries = list(merge_obj._entries_lca())
1789
1941
        root_id = 'a-root-id'
1797
1949
    def test_kind_changed(self):
1798
1950
        # Identical content, except 'D' changes a-id into a directory
1799
1951
        builder = self.get_builder()
1800
 
        builder.build_snapshot('A-id', None,
 
1952
        builder.build_snapshot(None,
1801
1953
            [('add', (u'', 'a-root-id', 'directory', None)),
1802
 
             ('add', (u'a', 'a-id', 'file', 'content\n'))])
1803
 
        builder.build_snapshot('B-id', ['A-id'], [])
1804
 
        builder.build_snapshot('C-id', ['A-id'], [])
1805
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'],
 
1954
             ('add', (u'a', 'a-id', 'file', 'content\n'))],
 
1955
            revision_id='A-id')
 
1956
        builder.build_snapshot(['A-id'], [], revision_id='B-id')
 
1957
        builder.build_snapshot(['A-id'], [], revision_id='C-id')
 
1958
        builder.build_snapshot(['C-id', 'B-id'],
1806
1959
            [('unversion', 'a-id'),
1807
 
             ('add', (u'a', 'a-id', 'directory', None))])
1808
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
 
1960
             ('flush', None),
 
1961
             ('add', (u'a', 'a-id', 'directory', None))],
 
1962
            revision_id='E-id')
 
1963
        builder.build_snapshot(['B-id', 'C-id'], [], revision_id='D-id')
1809
1964
        merge_obj = self.make_merge_obj(builder, 'E-id')
1810
1965
        entries = list(merge_obj._entries_lca())
1811
1966
        root_id = 'a-root-id'
1819
1974
    def test_this_changed_kind(self):
1820
1975
        # Identical content, but THIS changes a file to a directory
1821
1976
        builder = self.get_builder()
1822
 
        builder.build_snapshot('A-id', None,
 
1977
        builder.build_snapshot(None,
1823
1978
            [('add', (u'', 'a-root-id', 'directory', None)),
1824
 
             ('add', (u'a', 'a-id', 'file', 'content\n'))])
1825
 
        builder.build_snapshot('B-id', ['A-id'], [])
1826
 
        builder.build_snapshot('C-id', ['A-id'], [])
1827
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1828
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'],
 
1979
             ('add', (u'a', 'a-id', 'file', 'content\n'))],
 
1980
            revision_id='A-id')
 
1981
        builder.build_snapshot(['A-id'], [], revision_id='B-id')
 
1982
        builder.build_snapshot(['A-id'], [], revision_id='C-id')
 
1983
        builder.build_snapshot(['C-id', 'B-id'], [], revision_id='E-id')
 
1984
        builder.build_snapshot(['B-id', 'C-id'],
1829
1985
            [('unversion', 'a-id'),
1830
 
             ('add', (u'a', 'a-id', 'directory', None))])
 
1986
             ('flush', None),
 
1987
             ('add', (u'a', 'a-id', 'directory', None))],
 
1988
            revision_id='D-id')
1831
1989
        merge_obj = self.make_merge_obj(builder, 'E-id')
1832
1990
        entries = list(merge_obj._entries_lca())
1833
1991
        # Only the kind was changed (content)
1836
1994
    def test_interesting_files(self):
1837
1995
        # Two files modified, but we should filter one of them
1838
1996
        builder = self.get_builder()
1839
 
        builder.build_snapshot('A-id', None,
 
1997
        builder.build_snapshot(None,
1840
1998
            [('add', (u'', 'a-root-id', 'directory', None)),
1841
1999
             ('add', (u'a', 'a-id', 'file', 'content\n')),
1842
 
             ('add', (u'b', 'b-id', 'file', 'content\n'))])
1843
 
        builder.build_snapshot('B-id', ['A-id'], [])
1844
 
        builder.build_snapshot('C-id', ['A-id'], [])
1845
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'],
 
2000
             ('add', (u'b', 'b-id', 'file', 'content\n'))],
 
2001
            revision_id='A-id')
 
2002
        builder.build_snapshot(['A-id'], [], revision_id='B-id')
 
2003
        builder.build_snapshot(['A-id'], [], revision_id='C-id')
 
2004
        builder.build_snapshot(['C-id', 'B-id'],
1846
2005
            [('modify', ('a-id', 'new-content\n')),
1847
 
             ('modify', ('b-id', 'new-content\n'))])
1848
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
 
2006
             ('modify', ('b-id', 'new-content\n'))],
 
2007
            revision_id='E-id')
 
2008
        builder.build_snapshot(['B-id', 'C-id'], [], revision_id='D-id')
1849
2009
        merge_obj = self.make_merge_obj(builder, 'E-id',
1850
2010
                                        interesting_files=['b'])
1851
2011
        entries = list(merge_obj._entries_lca())
1859
2019
    def test_interesting_file_in_this(self):
1860
2020
        # This renamed the file, but it should still match the entry in other
1861
2021
        builder = self.get_builder()
1862
 
        builder.build_snapshot('A-id', None,
 
2022
        builder.build_snapshot(None,
1863
2023
            [('add', (u'', 'a-root-id', 'directory', None)),
1864
2024
             ('add', (u'a', 'a-id', 'file', 'content\n')),
1865
 
             ('add', (u'b', 'b-id', 'file', 'content\n'))])
1866
 
        builder.build_snapshot('B-id', ['A-id'], [])
1867
 
        builder.build_snapshot('C-id', ['A-id'], [])
1868
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'],
 
2025
             ('add', (u'b', 'b-id', 'file', 'content\n'))],
 
2026
            revision_id='A-id')
 
2027
        builder.build_snapshot(['A-id'], [], revision_id='B-id')
 
2028
        builder.build_snapshot(['A-id'], [], revision_id='C-id')
 
2029
        builder.build_snapshot(['C-id', 'B-id'],
1869
2030
            [('modify', ('a-id', 'new-content\n')),
1870
 
             ('modify', ('b-id', 'new-content\n'))])
1871
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'],
1872
 
            [('rename', ('b', 'c'))])
 
2031
             ('modify', ('b-id', 'new-content\n'))],
 
2032
            revision_id='E-id')
 
2033
        builder.build_snapshot(['B-id', 'C-id'],
 
2034
            [('rename', ('b', 'c'))],
 
2035
            revision_id='D-id')
1873
2036
        merge_obj = self.make_merge_obj(builder, 'E-id',
1874
2037
                                        interesting_files=['c'])
1875
2038
        entries = list(merge_obj._entries_lca())
1883
2046
    def test_interesting_file_in_base(self):
1884
2047
        # This renamed the file, but it should still match the entry in BASE
1885
2048
        builder = self.get_builder()
1886
 
        builder.build_snapshot('A-id', None,
 
2049
        builder.build_snapshot(None,
1887
2050
            [('add', (u'', 'a-root-id', 'directory', None)),
1888
2051
             ('add', (u'a', 'a-id', 'file', 'content\n')),
1889
 
             ('add', (u'c', 'c-id', 'file', 'content\n'))])
1890
 
        builder.build_snapshot('B-id', ['A-id'],
1891
 
            [('rename', ('c', 'b'))])
1892
 
        builder.build_snapshot('C-id', ['A-id'],
1893
 
            [('rename', ('c', 'b'))])
1894
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'],
 
2052
             ('add', (u'c', 'c-id', 'file', 'content\n'))],
 
2053
            revision_id='A-id')
 
2054
        builder.build_snapshot(['A-id'],
 
2055
            [('rename', ('c', 'b'))],
 
2056
            revision_id='B-id')
 
2057
        builder.build_snapshot(['A-id'],
 
2058
            [('rename', ('c', 'b'))],
 
2059
            revision_id='C-id')
 
2060
        builder.build_snapshot(['C-id', 'B-id'],
1895
2061
            [('modify', ('a-id', 'new-content\n')),
1896
 
             ('modify', ('c-id', 'new-content\n'))])
1897
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
 
2062
             ('modify', ('c-id', 'new-content\n'))],
 
2063
            revision_id='E-id')
 
2064
        builder.build_snapshot(['B-id', 'C-id'], [], revision_id='D-id')
1898
2065
        merge_obj = self.make_merge_obj(builder, 'E-id',
1899
2066
                                        interesting_files=['c'])
1900
2067
        entries = list(merge_obj._entries_lca())
1908
2075
    def test_interesting_file_in_lca(self):
1909
2076
        # This renamed the file, but it should still match the entry in LCA
1910
2077
        builder = self.get_builder()
1911
 
        builder.build_snapshot('A-id', None,
 
2078
        builder.build_snapshot(None,
1912
2079
            [('add', (u'', 'a-root-id', 'directory', None)),
1913
2080
             ('add', (u'a', 'a-id', 'file', 'content\n')),
1914
 
             ('add', (u'b', 'b-id', 'file', 'content\n'))])
1915
 
        builder.build_snapshot('B-id', ['A-id'],
1916
 
            [('rename', ('b', 'c'))])
1917
 
        builder.build_snapshot('C-id', ['A-id'], [])
1918
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'],
 
2081
             ('add', (u'b', 'b-id', 'file', 'content\n'))],
 
2082
            revision_id='A-id')
 
2083
        builder.build_snapshot(['A-id'],
 
2084
            [('rename', ('b', 'c'))], revision_id='B-id')
 
2085
        builder.build_snapshot(['A-id'], [], revision_id='C-id')
 
2086
        builder.build_snapshot(['C-id', 'B-id'],
1919
2087
            [('modify', ('a-id', 'new-content\n')),
1920
 
             ('modify', ('b-id', 'new-content\n'))])
1921
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'],
1922
 
            [('rename', ('c', 'b'))])
 
2088
             ('modify', ('b-id', 'new-content\n'))],
 
2089
            revision_id='E-id')
 
2090
        builder.build_snapshot(['B-id', 'C-id'],
 
2091
            [('rename', ('c', 'b'))], revision_id='D-id')
1923
2092
        merge_obj = self.make_merge_obj(builder, 'E-id',
1924
2093
                                        interesting_files=['c'])
1925
2094
        entries = list(merge_obj._entries_lca())
1933
2102
    def test_interesting_ids(self):
1934
2103
        # Two files modified, but we should filter one of them
1935
2104
        builder = self.get_builder()
1936
 
        builder.build_snapshot('A-id', None,
 
2105
        builder.build_snapshot(None,
1937
2106
            [('add', (u'', 'a-root-id', 'directory', None)),
1938
2107
             ('add', (u'a', 'a-id', 'file', 'content\n')),
1939
 
             ('add', (u'b', 'b-id', 'file', 'content\n'))])
1940
 
        builder.build_snapshot('B-id', ['A-id'], [])
1941
 
        builder.build_snapshot('C-id', ['A-id'], [])
1942
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'],
 
2108
             ('add', (u'b', 'b-id', 'file', 'content\n'))],
 
2109
            revision_id='A-id')
 
2110
        builder.build_snapshot(['A-id'], [], revision_id='B-id')
 
2111
        builder.build_snapshot(['A-id'], [], revision_id='C-id')
 
2112
        builder.build_snapshot(['C-id', 'B-id'],
1943
2113
            [('modify', ('a-id', 'new-content\n')),
1944
 
             ('modify', ('b-id', 'new-content\n'))])
1945
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
 
2114
             ('modify', ('b-id', 'new-content\n'))], revision_id='E-id')
 
2115
        builder.build_snapshot(['B-id', 'C-id'], [], revision_id='D-id')
1946
2116
        merge_obj = self.make_merge_obj(builder, 'E-id',
1947
2117
                                        interesting_ids=['b-id'])
1948
2118
        entries = list(merge_obj._entries_lca())
1966
2136
    def get_wt_from_builder(self, builder):
1967
2137
        """Get a real WorkingTree from the builder."""
1968
2138
        the_branch = builder.get_branch()
1969
 
        wt = the_branch.bzrdir.create_workingtree()
 
2139
        wt = the_branch.controldir.create_workingtree()
1970
2140
        # Note: This is a little bit ugly, but we are holding the branch
1971
2141
        #       write-locked as part of the build process, and we would like to
1972
2142
        #       maintain that. So we just force the WT to re-use the same
1978
2148
 
1979
2149
    def do_merge(self, builder, other_revision_id):
1980
2150
        wt = self.get_wt_from_builder(builder)
1981
 
        merger = _mod_merge.Merger.from_revision_ids(None,
 
2151
        merger = _mod_merge.Merger.from_revision_ids(
1982
2152
            wt, other_revision_id)
1983
2153
        merger.merge_type = _mod_merge.Merge3Merger
1984
2154
        return wt, merger.do_merge()
1985
2155
 
1986
2156
    def test_simple_lca(self):
1987
2157
        builder = self.get_builder()
1988
 
        builder.build_snapshot('A-id', None,
 
2158
        builder.build_snapshot(None,
1989
2159
            [('add', (u'', 'a-root-id', 'directory', None)),
1990
 
             ('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))])
1991
 
        builder.build_snapshot('C-id', ['A-id'], [])
1992
 
        builder.build_snapshot('B-id', ['A-id'], [])
1993
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1994
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'],
1995
 
            [('modify', ('a-id', 'a\nb\nc\nd\ne\nf\n'))])
 
2160
             ('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))],
 
2161
            revision_id='A-id')
 
2162
        builder.build_snapshot(['A-id'], [], revision_id='C-id')
 
2163
        builder.build_snapshot(['A-id'], [], revision_id='B-id')
 
2164
        builder.build_snapshot(['C-id', 'B-id'], [], revision_id='E-id')
 
2165
        builder.build_snapshot(['B-id', 'C-id'],
 
2166
            [('modify', ('a-id', 'a\nb\nc\nd\ne\nf\n'))],
 
2167
            revision_id='D-id')
1996
2168
        wt, conflicts = self.do_merge(builder, 'E-id')
1997
2169
        self.assertEqual(0, conflicts)
1998
2170
        # The merge should have simply update the contents of 'a'
1999
 
        self.assertEqual('a\nb\nc\nd\ne\nf\n', wt.get_file_text('a-id'))
 
2171
        self.assertEqual('a\nb\nc\nd\ne\nf\n', wt.get_file_text('a'))
2000
2172
 
2001
2173
    def test_conflict_without_lca(self):
2002
2174
        # This test would cause a merge conflict, unless we use the lca trees
2011
2183
        #     |
2012
2184
        #     F     Path at 'baz' in F, which supersedes 'bar' and 'foo'
2013
2185
        builder = self.get_builder()
2014
 
        builder.build_snapshot('A-id', None,
 
2186
        builder.build_snapshot(None,
2015
2187
            [('add', (u'', 'a-root-id', 'directory', None)),
2016
 
             ('add', (u'foo', 'foo-id', 'file', 'a\nb\nc\n'))])
2017
 
        builder.build_snapshot('C-id', ['A-id'], [])
2018
 
        builder.build_snapshot('B-id', ['A-id'],
2019
 
            [('rename', ('foo', 'bar'))])
2020
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'], # merge the rename
2021
 
            [('rename', ('foo', 'bar'))])
2022
 
        builder.build_snapshot('F-id', ['E-id'],
2023
 
            [('rename', ('bar', 'baz'))])
2024
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
 
2188
             ('add', (u'foo', 'foo-id', 'file', 'a\nb\nc\n'))],
 
2189
            revision_id='A-id')
 
2190
        builder.build_snapshot(['A-id'], [], revision_id='C-id')
 
2191
        builder.build_snapshot(['A-id'],
 
2192
            [('rename', ('foo', 'bar'))], revision_id='B-id', )
 
2193
        builder.build_snapshot(['C-id', 'B-id'], # merge the rename
 
2194
            [('rename', ('foo', 'bar'))], revision_id='E-id')
 
2195
        builder.build_snapshot(['E-id'],
 
2196
            [('rename', ('bar', 'baz'))], revision_id='F-id')
 
2197
        builder.build_snapshot(['B-id', 'C-id'], [], revision_id='D-id')
2025
2198
        wt, conflicts = self.do_merge(builder, 'F-id')
2026
2199
        self.assertEqual(0, conflicts)
2027
2200
        # The merge should simply recognize that the final rename takes
2041
2214
        #     |
2042
2215
        #     F     F deletes 'bar'
2043
2216
        builder = self.get_builder()
2044
 
        builder.build_snapshot('A-id', None,
 
2217
        builder.build_snapshot(None,
2045
2218
            [('add', (u'', 'a-root-id', 'directory', None)),
2046
 
             ('add', (u'foo', 'foo-id', 'file', 'a\nb\nc\n'))])
2047
 
        builder.build_snapshot('C-id', ['A-id'], [])
2048
 
        builder.build_snapshot('B-id', ['A-id'],
2049
 
            [('rename', ('foo', 'bar'))])
2050
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'], # merge the rename
2051
 
            [('rename', ('foo', 'bar'))])
2052
 
        builder.build_snapshot('F-id', ['E-id'],
2053
 
            [('unversion', 'foo-id')])
2054
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
 
2219
             ('add', (u'foo', 'foo-id', 'file', 'a\nb\nc\n'))],
 
2220
            revision_id='A-id')
 
2221
        builder.build_snapshot(['A-id'], [], revision_id='C-id')
 
2222
        builder.build_snapshot(['A-id'],
 
2223
            [('rename', ('foo', 'bar'))], revision_id='B-id')
 
2224
        builder.build_snapshot(['C-id', 'B-id'], # merge the rename
 
2225
            [('rename', ('foo', 'bar'))], revision_id='E-id')
 
2226
        builder.build_snapshot(['E-id'],
 
2227
            [('unversion', 'foo-id')], revision_id='F-id')
 
2228
        builder.build_snapshot(['B-id', 'C-id'], [], revision_id='D-id')
2055
2229
        wt, conflicts = self.do_merge(builder, 'F-id')
2056
2230
        self.assertEqual(0, conflicts)
2057
2231
        self.assertRaises(errors.NoSuchId, wt.id2path, 'foo-id')
2067
2241
        #     |
2068
2242
        #     F     Executable bit changed
2069
2243
        builder = self.get_builder()
2070
 
        builder.build_snapshot('A-id', None,
 
2244
        builder.build_snapshot(None,
2071
2245
            [('add', (u'', 'a-root-id', 'directory', None)),
2072
 
             ('add', (u'foo', 'foo-id', 'file', 'a\nb\nc\n'))])
2073
 
        builder.build_snapshot('C-id', ['A-id'], [])
2074
 
        builder.build_snapshot('B-id', ['A-id'], [])
2075
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
2076
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
 
2246
             ('add', (u'foo', 'foo-id', 'file', 'a\nb\nc\n'))],
 
2247
            revision_id='A-id')
 
2248
        builder.build_snapshot(['A-id'], [], revision_id='C-id')
 
2249
        builder.build_snapshot(['A-id'], [], revision_id='B-id')
 
2250
        builder.build_snapshot(['B-id', 'C-id'], [], revision_id='D-id')
 
2251
        builder.build_snapshot(['C-id', 'B-id'], [], revision_id='E-id')
2077
2252
        # Have to use a real WT, because BranchBuilder doesn't support exec bit
2078
2253
        wt = self.get_wt_from_builder(builder)
2079
2254
        tt = transform.TreeTransform(wt)
2083
2258
        except:
2084
2259
            tt.finalize()
2085
2260
            raise
2086
 
        self.assertTrue(wt.is_executable('foo-id'))
 
2261
        self.assertTrue(wt.is_executable('foo'))
2087
2262
        wt.commit('F-id', rev_id='F-id')
2088
2263
        # Reset to D, so that we can merge F
2089
2264
        wt.set_parent_ids(['D-id'])
2090
2265
        wt.branch.set_last_revision_info(3, 'D-id')
2091
2266
        wt.revert()
2092
 
        self.assertFalse(wt.is_executable('foo-id'))
 
2267
        self.assertFalse(wt.is_executable('foo'))
2093
2268
        conflicts = wt.merge_from_branch(wt.branch, to_revision='F-id')
2094
2269
        self.assertEqual(0, conflicts)
2095
 
        self.assertTrue(wt.is_executable('foo-id'))
 
2270
        self.assertTrue(wt.is_executable('foo'))
2096
2271
 
2097
2272
    def test_create_symlink(self):
2098
 
        self.requireFeature(tests.SymlinkFeature)
 
2273
        self.requireFeature(features.SymlinkFeature)
2099
2274
        #   A
2100
2275
        #  / \
2101
2276
        # B   C
2108
2283
        # Have to use a real WT, because BranchBuilder and MemoryTree don't
2109
2284
        # have symlink support
2110
2285
        builder = self.get_builder()
2111
 
        builder.build_snapshot('A-id', None,
2112
 
            [('add', (u'', 'a-root-id', 'directory', None))])
2113
 
        builder.build_snapshot('C-id', ['A-id'], [])
2114
 
        builder.build_snapshot('B-id', ['A-id'], [])
2115
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
2116
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
 
2286
        builder.build_snapshot(None,
 
2287
            [('add', (u'', 'a-root-id', 'directory', None))],
 
2288
            revision_id='A-id')
 
2289
        builder.build_snapshot(['A-id'], [], revision_id='C-id')
 
2290
        builder.build_snapshot(['A-id'], [], revision_id='B-id')
 
2291
        builder.build_snapshot(['B-id', 'C-id'], [], revision_id='D-id')
 
2292
        builder.build_snapshot(['C-id', 'B-id'], [], revision_id='E-id')
2117
2293
        # Have to use a real WT, because BranchBuilder doesn't support exec bit
2118
2294
        wt = self.get_wt_from_builder(builder)
2119
2295
        os.symlink('bar', 'path/foo')
2120
2296
        wt.add(['foo'], ['foo-id'])
2121
 
        self.assertEqual('bar', wt.get_symlink_target('foo-id'))
 
2297
        self.assertEqual('bar', wt.get_symlink_target('foo'))
2122
2298
        wt.commit('add symlink', rev_id='F-id')
2123
2299
        # Reset to D, so that we can merge F
2124
2300
        wt.set_parent_ids(['D-id'])
2128
2304
        conflicts = wt.merge_from_branch(wt.branch, to_revision='F-id')
2129
2305
        self.assertEqual(0, conflicts)
2130
2306
        self.assertEqual('foo-id', wt.path2id('foo'))
2131
 
        self.assertEqual('bar', wt.get_symlink_target('foo-id'))
 
2307
        self.assertEqual('bar', wt.get_symlink_target('foo'))
2132
2308
 
2133
2309
    def test_both_sides_revert(self):
2134
2310
        # Both sides of a criss-cross revert the text to the lca
2141
2317
        # This must be done with a real WorkingTree, because normally their
2142
2318
        # inventory contains "None" rather than a real sha1
2143
2319
        builder = self.get_builder()
2144
 
        builder.build_snapshot('A-id', None,
 
2320
        builder.build_snapshot(None,
2145
2321
            [('add', (u'', 'a-root-id', 'directory', None)),
2146
 
             ('add', (u'foo', 'foo-id', 'file', 'A content\n'))])
2147
 
        builder.build_snapshot('B-id', ['A-id'],
2148
 
            [('modify', ('foo-id', 'B content\n'))])
2149
 
        builder.build_snapshot('C-id', ['A-id'],
2150
 
            [('modify', ('foo-id', 'C content\n'))])
2151
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
2152
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
 
2322
             ('add', (u'foo', 'foo-id', 'file', 'A content\n'))],
 
2323
            revision_id='A-id')
 
2324
        builder.build_snapshot(['A-id'],
 
2325
            [('modify', ('foo-id', 'B content\n'))],
 
2326
            revision_id='B-id')
 
2327
        builder.build_snapshot(['A-id'],
 
2328
            [('modify', ('foo-id', 'C content\n'))],
 
2329
            revision_id='C-id')
 
2330
        builder.build_snapshot(['C-id', 'B-id'], [],
 
2331
                revision_id='E-id')
 
2332
        builder.build_snapshot(['B-id', 'C-id'], [],
 
2333
                revision_id='D-id')
2153
2334
        wt, conflicts = self.do_merge(builder, 'E-id')
2154
2335
        self.assertEqual(1, conflicts)
2155
2336
        self.assertEqualDiff('<<<<<<< TREE\n'
2157
2338
                             '=======\n'
2158
2339
                             'C content\n'
2159
2340
                             '>>>>>>> MERGE-SOURCE\n',
2160
 
                             wt.get_file_text('foo-id'))
 
2341
                             wt.get_file_text('foo'))
2161
2342
 
2162
2343
    def test_modified_symlink(self):
2163
 
        self.requireFeature(tests.SymlinkFeature)
 
2344
        self.requireFeature(features.SymlinkFeature)
2164
2345
        #   A       Create symlink foo => bar
2165
2346
        #  / \
2166
2347
        # B   C     B relinks foo => baz
2190
2371
        wt.revert()
2191
2372
        wt.commit('C', rev_id='C-id')
2192
2373
        wt.merge_from_branch(wt.branch, 'B-id')
2193
 
        self.assertEqual('baz', wt.get_symlink_target('foo-id'))
 
2374
        self.assertEqual('baz', wt.get_symlink_target('foo'))
2194
2375
        wt.commit('E merges C & B', rev_id='E-id')
2195
2376
        os.remove('path/foo')
2196
2377
        os.symlink('bing', 'path/foo')
2202
2383
        wt.commit('D merges B & C', rev_id='D-id')
2203
2384
        conflicts = wt.merge_from_branch(wt.branch, to_revision='F-id')
2204
2385
        self.assertEqual(0, conflicts)
2205
 
        self.assertEqual('bing', wt.get_symlink_target('foo-id'))
 
2386
        self.assertEqual('bing', wt.get_symlink_target('foo'))
2206
2387
 
2207
2388
    def test_renamed_symlink(self):
2208
 
        self.requireFeature(tests.SymlinkFeature)
 
2389
        self.requireFeature(features.SymlinkFeature)
2209
2390
        #   A       Create symlink foo => bar
2210
2391
        #  / \
2211
2392
        # B   C     B renames foo => barry
2233
2414
        wt.commit('C', rev_id='C-id')
2234
2415
        wt.merge_from_branch(wt.branch, 'B-id')
2235
2416
        self.assertEqual('barry', wt.id2path('foo-id'))
2236
 
        self.assertEqual('bar', wt.get_symlink_target('foo-id'))
 
2417
        self.assertEqual('bar', wt.get_symlink_target('barry'))
2237
2418
        wt.commit('E merges C & B', rev_id='E-id')
2238
2419
        wt.rename_one('barry', 'blah')
2239
2420
        wt.commit('F barry => blah', rev_id='F-id')
2244
2425
        wt.commit('D merges B & C', rev_id='D-id')
2245
2426
        self.assertEqual('barry', wt.id2path('foo-id'))
2246
2427
        # Check the output of the Merger object directly
2247
 
        merger = _mod_merge.Merger.from_revision_ids(None,
2248
 
            wt, 'F-id')
 
2428
        merger = _mod_merge.Merger.from_revision_ids(wt, 'F-id')
2249
2429
        merger.merge_type = _mod_merge.Merge3Merger
2250
2430
        merge_obj = merger.make_merger()
2251
2431
        root_id = wt.path2id('')
2261
2441
        self.assertEqual('blah', wt.id2path('foo-id'))
2262
2442
 
2263
2443
    def test_symlink_no_content_change(self):
2264
 
        self.requireFeature(tests.SymlinkFeature)
 
2444
        self.requireFeature(features.SymlinkFeature)
2265
2445
        #   A       Create symlink foo => bar
2266
2446
        #  / \
2267
2447
        # B   C     B relinks foo => baz
2288
2468
        wt.revert()
2289
2469
        wt.commit('C', rev_id='C-id')
2290
2470
        wt.merge_from_branch(wt.branch, 'B-id')
2291
 
        self.assertEqual('baz', wt.get_symlink_target('foo-id'))
 
2471
        self.assertEqual('baz', wt.get_symlink_target('foo'))
2292
2472
        wt.commit('E merges C & B', rev_id='E-id')
2293
2473
        wt.set_last_revision('B-id')
2294
2474
        wt.branch.set_last_revision_info(2, 'B-id')
2300
2480
        wt.commit('F foo => bing', rev_id='F-id')
2301
2481
 
2302
2482
        # Check the output of the Merger object directly
2303
 
        merger = _mod_merge.Merger.from_revision_ids(None,
2304
 
            wt, 'E-id')
 
2483
        merger = _mod_merge.Merger.from_revision_ids(wt, 'E-id')
2305
2484
        merger.merge_type = _mod_merge.Merge3Merger
2306
2485
        merge_obj = merger.make_merger()
2307
2486
        # Nothing interesting happened in OTHER relative to BASE
2309
2488
        # Now do a real merge, just to test the rest of the stack
2310
2489
        conflicts = wt.merge_from_branch(wt.branch, to_revision='E-id')
2311
2490
        self.assertEqual(0, conflicts)
2312
 
        self.assertEqual('bing', wt.get_symlink_target('foo-id'))
 
2491
        self.assertEqual('bing', wt.get_symlink_target('foo'))
2313
2492
 
2314
2493
    def test_symlink_this_changed_kind(self):
2315
 
        self.requireFeature(tests.SymlinkFeature)
 
2494
        self.requireFeature(features.SymlinkFeature)
2316
2495
        #   A       Nothing
2317
2496
        #  / \
2318
2497
        # B   C     B creates symlink foo => bar
2335
2514
        wt.revert()
2336
2515
        wt.commit('C', rev_id='C-id')
2337
2516
        wt.merge_from_branch(wt.branch, 'B-id')
2338
 
        self.assertEqual('bar', wt.get_symlink_target('foo-id'))
 
2517
        self.assertEqual('bar', wt.get_symlink_target('foo'))
2339
2518
        os.remove('path/foo')
2340
2519
        # We have to change the link in E, or it won't try to do a comparison
2341
2520
        os.symlink('bing', 'path/foo')
2351
2530
        list(wt.iter_changes(wt.basis_tree()))
2352
2531
        wt.commit('D merges B & C, makes it a file', rev_id='D-id')
2353
2532
 
2354
 
        merger = _mod_merge.Merger.from_revision_ids(None,
2355
 
            wt, 'E-id')
 
2533
        merger = _mod_merge.Merger.from_revision_ids(wt, 'E-id')
2356
2534
        merger.merge_type = _mod_merge.Merge3Merger
2357
2535
        merge_obj = merger.make_merger()
2358
2536
        entries = list(merge_obj._entries_lca())
2365
2543
 
2366
2544
    def test_symlink_all_wt(self):
2367
2545
        """Check behavior if all trees are Working Trees."""
2368
 
        self.requireFeature(tests.SymlinkFeature)
 
2546
        self.requireFeature(features.SymlinkFeature)
2369
2547
        # The big issue is that entry.symlink_target is None for WorkingTrees.
2370
2548
        # So we need to make sure we handle that case correctly.
2371
2549
        #   A   foo => bar
2392
2570
        wt.revert()
2393
2571
        wt.commit('C', rev_id='C-id')
2394
2572
        wt.merge_from_branch(wt.branch, 'B-id')
2395
 
        self.assertEqual('baz', wt.get_symlink_target('foo-id'))
 
2573
        self.assertEqual('baz', wt.get_symlink_target('foo'))
2396
2574
        wt.commit('E merges C & B', rev_id='E-id')
2397
2575
        os.remove('path/foo')
2398
2576
        os.symlink('bing', 'path/foo')
2402
2580
        wt.revert()
2403
2581
        wt.merge_from_branch(wt.branch, 'C-id')
2404
2582
        wt.commit('D merges B & C', rev_id='D-id')
2405
 
        wt_base = wt.bzrdir.sprout('base', 'A-id').open_workingtree()
 
2583
        wt_base = wt.controldir.sprout('base', 'A-id').open_workingtree()
2406
2584
        wt_base.lock_read()
2407
2585
        self.addCleanup(wt_base.unlock)
2408
 
        wt_lca1 = wt.bzrdir.sprout('b-tree', 'B-id').open_workingtree()
 
2586
        wt_lca1 = wt.controldir.sprout('b-tree', 'B-id').open_workingtree()
2409
2587
        wt_lca1.lock_read()
2410
2588
        self.addCleanup(wt_lca1.unlock)
2411
 
        wt_lca2 = wt.bzrdir.sprout('c-tree', 'C-id').open_workingtree()
 
2589
        wt_lca2 = wt.controldir.sprout('c-tree', 'C-id').open_workingtree()
2412
2590
        wt_lca2.lock_read()
2413
2591
        self.addCleanup(wt_lca2.unlock)
2414
 
        wt_other = wt.bzrdir.sprout('other', 'F-id').open_workingtree()
 
2592
        wt_other = wt.controldir.sprout('other', 'F-id').open_workingtree()
2415
2593
        wt_other.lock_read()
2416
2594
        self.addCleanup(wt_other.unlock)
2417
2595
        merge_obj = _mod_merge.Merge3Merger(wt, wt, wt_base,
2435
2613
        #     |
2436
2614
        #     F     Path at 'foo'
2437
2615
        builder = self.get_builder()
2438
 
        builder.build_snapshot('A-id', None,
 
2616
        builder.build_snapshot(None,
2439
2617
            [('add', (u'', 'a-root-id', 'directory', None)),
2440
 
             ('add', (u'foo', 'foo-id', 'file', 'a\nb\nc\n'))])
2441
 
        builder.build_snapshot('C-id', ['A-id'], [])
2442
 
        builder.build_snapshot('B-id', ['A-id'],
2443
 
            [('rename', ('foo', 'bar'))])
2444
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'],
2445
 
            [('rename', ('foo', 'bar'))]) # merge the rename
2446
 
        builder.build_snapshot('F-id', ['E-id'],
2447
 
            [('rename', ('bar', 'foo'))]) # Rename back to BASE
2448
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
 
2618
             ('add', (u'foo', 'foo-id', 'file', 'a\nb\nc\n'))],
 
2619
            revision_id='A-id')
 
2620
        builder.build_snapshot(['A-id'], [], revision_id='C-id')
 
2621
        builder.build_snapshot(['A-id'],
 
2622
            [('rename', ('foo', 'bar'))], revision_id='B-id')
 
2623
        builder.build_snapshot(['C-id', 'B-id'],
 
2624
            [('rename', ('foo', 'bar'))], revision_id='E-id') # merge the rename
 
2625
        builder.build_snapshot(['E-id'],
 
2626
            [('rename', ('bar', 'foo'))], revision_id='F-id') # Rename back to BASE
 
2627
        builder.build_snapshot(['B-id', 'C-id'], [], revision_id='D-id')
2449
2628
        wt, conflicts = self.do_merge(builder, 'F-id')
2450
2629
        self.assertEqual(0, conflicts)
2451
2630
        self.assertEqual('foo', wt.id2path('foo-id'))
2452
2631
 
2453
2632
    def test_other_reverted_content_to_base(self):
2454
2633
        builder = self.get_builder()
2455
 
        builder.build_snapshot('A-id', None,
 
2634
        builder.build_snapshot(None,
2456
2635
            [('add', (u'', 'a-root-id', 'directory', None)),
2457
 
             ('add', (u'foo', 'foo-id', 'file', 'base content\n'))])
2458
 
        builder.build_snapshot('C-id', ['A-id'], [])
2459
 
        builder.build_snapshot('B-id', ['A-id'],
2460
 
            [('modify', ('foo-id', 'B content\n'))])
2461
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'],
2462
 
            [('modify', ('foo-id', 'B content\n'))]) # merge the content
2463
 
        builder.build_snapshot('F-id', ['E-id'],
2464
 
            [('modify', ('foo-id', 'base content\n'))]) # Revert back to BASE
2465
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
 
2636
             ('add', (u'foo', 'foo-id', 'file', 'base content\n'))],
 
2637
            revision_id='A-id')
 
2638
        builder.build_snapshot(['A-id'], [], revision_id='C-id')
 
2639
        builder.build_snapshot(['A-id'],
 
2640
            [('modify', ('foo-id', 'B content\n'))],
 
2641
            revision_id='B-id')
 
2642
        builder.build_snapshot(['C-id', 'B-id'],
 
2643
            [('modify', ('foo-id', 'B content\n'))],
 
2644
            revision_id='E-id') # merge the content
 
2645
        builder.build_snapshot(['E-id'],
 
2646
            [('modify', ('foo-id', 'base content\n'))],
 
2647
            revision_id='F-id') # Revert back to BASE
 
2648
        builder.build_snapshot(['B-id', 'C-id'], [], revision_id='D-id')
2466
2649
        wt, conflicts = self.do_merge(builder, 'F-id')
2467
2650
        self.assertEqual(0, conflicts)
2468
2651
        # TODO: We need to use the per-file graph to properly select a BASE
2469
2652
        #       before this will work. Or at least use the LCA trees to find
2470
2653
        #       the appropriate content base. (which is B, not A).
2471
 
        self.assertEqual('base content\n', wt.get_file_text('foo-id'))
 
2654
        self.assertEqual('base content\n', wt.get_file_text('foo'))
2472
2655
 
2473
2656
    def test_other_modified_content(self):
2474
2657
        builder = self.get_builder()
2475
 
        builder.build_snapshot('A-id', None,
 
2658
        builder.build_snapshot(None,
2476
2659
            [('add', (u'', 'a-root-id', 'directory', None)),
2477
 
             ('add', (u'foo', 'foo-id', 'file', 'base content\n'))])
2478
 
        builder.build_snapshot('C-id', ['A-id'], [])
2479
 
        builder.build_snapshot('B-id', ['A-id'],
2480
 
            [('modify', ('foo-id', 'B content\n'))])
2481
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'],
2482
 
            [('modify', ('foo-id', 'B content\n'))]) # merge the content
2483
 
        builder.build_snapshot('F-id', ['E-id'],
2484
 
            [('modify', ('foo-id', 'F content\n'))]) # Override B content
2485
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
 
2660
             ('add', (u'foo', 'foo-id', 'file', 'base content\n'))],
 
2661
            revision_id='A-id')
 
2662
        builder.build_snapshot(['A-id'], [], revision_id='C-id')
 
2663
        builder.build_snapshot(['A-id'],
 
2664
            [('modify', ('foo-id', 'B content\n'))],
 
2665
            revision_id='B-id')
 
2666
        builder.build_snapshot(['C-id', 'B-id'],
 
2667
            [('modify', ('foo-id', 'B content\n'))],
 
2668
            revision_id='E-id') # merge the content
 
2669
        builder.build_snapshot(['E-id'],
 
2670
            [('modify', ('foo-id', 'F content\n'))],
 
2671
            revision_id='F-id') # Override B content
 
2672
        builder.build_snapshot(['B-id', 'C-id'], [], revision_id='D-id')
2486
2673
        wt, conflicts = self.do_merge(builder, 'F-id')
2487
2674
        self.assertEqual(0, conflicts)
2488
 
        self.assertEqual('F content\n', wt.get_file_text('foo-id'))
 
2675
        self.assertEqual('F content\n', wt.get_file_text('foo'))
2489
2676
 
2490
2677
    def test_all_wt(self):
2491
2678
        """Check behavior if all trees are Working Trees."""
2498
2685
        #   |X|
2499
2686
        #   D E E updates content, renames 'b' => 'c'
2500
2687
        builder = self.get_builder()
2501
 
        builder.build_snapshot('A-id', None,
 
2688
        builder.build_snapshot(None,
2502
2689
            [('add', (u'', 'a-root-id', 'directory', None)),
2503
2690
             ('add', (u'a', 'a-id', 'file', 'base content\n')),
2504
 
             ('add', (u'foo', 'foo-id', 'file', 'base content\n'))])
2505
 
        builder.build_snapshot('B-id', ['A-id'],
2506
 
            [('modify', ('foo-id', 'B content\n'))])
2507
 
        builder.build_snapshot('C-id', ['A-id'],
2508
 
            [('rename', ('a', 'b'))])
2509
 
        builder.build_snapshot('E-id', ['C-id', 'B-id'],
 
2691
             ('add', (u'foo', 'foo-id', 'file', 'base content\n'))],
 
2692
            revision_id='A-id')
 
2693
        builder.build_snapshot(['A-id'],
 
2694
            [('modify', ('foo-id', 'B content\n'))],
 
2695
            revision_id='B-id')
 
2696
        builder.build_snapshot(['A-id'],
 
2697
            [('rename', ('a', 'b'))],
 
2698
            revision_id='C-id')
 
2699
        builder.build_snapshot(['C-id', 'B-id'],
2510
2700
            [('rename', ('b', 'c')),
2511
 
             ('modify', ('foo-id', 'E content\n'))])
2512
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'],
2513
 
            [('rename', ('a', 'b'))]) # merged change
 
2701
             ('modify', ('foo-id', 'E content\n'))],
 
2702
            revision_id='E-id')
 
2703
        builder.build_snapshot(['B-id', 'C-id'],
 
2704
            [('rename', ('a', 'b'))], revision_id='D-id') # merged change
2514
2705
        wt_this = self.get_wt_from_builder(builder)
2515
 
        wt_base = wt_this.bzrdir.sprout('base', 'A-id').open_workingtree()
 
2706
        wt_base = wt_this.controldir.sprout('base', 'A-id').open_workingtree()
2516
2707
        wt_base.lock_read()
2517
2708
        self.addCleanup(wt_base.unlock)
2518
 
        wt_lca1 = wt_this.bzrdir.sprout('b-tree', 'B-id').open_workingtree()
 
2709
        wt_lca1 = wt_this.controldir.sprout('b-tree', 'B-id').open_workingtree()
2519
2710
        wt_lca1.lock_read()
2520
2711
        self.addCleanup(wt_lca1.unlock)
2521
 
        wt_lca2 = wt_this.bzrdir.sprout('c-tree', 'C-id').open_workingtree()
 
2712
        wt_lca2 = wt_this.controldir.sprout('c-tree', 'C-id').open_workingtree()
2522
2713
        wt_lca2.lock_read()
2523
2714
        self.addCleanup(wt_lca2.unlock)
2524
 
        wt_other = wt_this.bzrdir.sprout('other', 'E-id').open_workingtree()
 
2715
        wt_other = wt_this.controldir.sprout('other', 'E-id').open_workingtree()
2525
2716
        wt_other.lock_read()
2526
2717
        self.addCleanup(wt_other.unlock)
2527
2718
        merge_obj = _mod_merge.Merge3Merger(wt_this, wt_this, wt_base,
2542
2733
        # Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2543
2734
        # 'tree-reference'
2544
2735
        wt = self.make_branch_and_tree('tree',
2545
 
            format='dirstate-with-subtree')
 
2736
            format='development-subtree')
2546
2737
        wt.lock_write()
2547
2738
        self.addCleanup(wt.unlock)
2548
2739
        sub_tree = self.make_branch_and_tree('tree/sub-tree',
2549
 
            format='dirstate-with-subtree')
 
2740
            format='development-subtree')
2550
2741
        wt.set_root_id('a-root-id')
2551
2742
        sub_tree.set_root_id('sub-tree-root')
2552
2743
        self.build_tree_contents([('tree/sub-tree/file', 'text1')])
2566
2757
        wt.branch.set_last_revision_info(2, 'B-id')
2567
2758
        wt.commit('D', rev_id='D-id', recursive=None)
2568
2759
 
2569
 
        merger = _mod_merge.Merger.from_revision_ids(None,
2570
 
            wt, 'E-id')
 
2760
        merger = _mod_merge.Merger.from_revision_ids(wt, 'E-id')
2571
2761
        merger.merge_type = _mod_merge.Merge3Merger
2572
2762
        merge_obj = merger.make_merger()
2573
2763
        entries = list(merge_obj._entries_lca())
2577
2767
        # Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2578
2768
        # 'tree-reference'
2579
2769
        wt = self.make_branch_and_tree('tree',
2580
 
            format='dirstate-with-subtree')
 
2770
            format='development-subtree')
2581
2771
        wt.lock_write()
2582
2772
        self.addCleanup(wt.unlock)
2583
2773
        sub_tree = self.make_branch_and_tree('tree/sub',
2584
 
            format='dirstate-with-subtree')
 
2774
            format='development-subtree')
2585
2775
        wt.set_root_id('a-root-id')
2586
2776
        sub_tree.set_root_id('sub-tree-root')
2587
2777
        self.build_tree_contents([('tree/sub/file', 'text1')])
2603
2793
        wt.branch.set_last_revision_info(2, 'B-id')
2604
2794
        wt.commit('D', rev_id='D-id', recursive=None)
2605
2795
 
2606
 
        merger = _mod_merge.Merger.from_revision_ids(None,
2607
 
            wt, 'E-id')
 
2796
        merger = _mod_merge.Merger.from_revision_ids(wt, 'E-id')
2608
2797
        merger.merge_type = _mod_merge.Merge3Merger
2609
2798
        merge_obj = merger.make_merger()
2610
2799
        entries = list(merge_obj._entries_lca())
2616
2805
        # Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2617
2806
        # 'tree-reference'
2618
2807
        wt = self.make_branch_and_tree('tree',
2619
 
            format='dirstate-with-subtree')
 
2808
            format='development-subtree')
2620
2809
        wt.lock_write()
2621
2810
        self.addCleanup(wt.unlock)
2622
2811
        sub_tree = self.make_branch_and_tree('tree/sub',
2623
 
            format='dirstate-with-subtree')
 
2812
            format='development-subtree')
2624
2813
        wt.set_root_id('a-root-id')
2625
2814
        sub_tree.set_root_id('sub-tree-root')
2626
2815
        self.build_tree_contents([('tree/sub/file', 'text1')])
2643
2832
        wt.branch.set_last_revision_info(2, 'B-id')
2644
2833
        wt.commit('D', rev_id='D-id', recursive=None)
2645
2834
 
2646
 
        merger = _mod_merge.Merger.from_revision_ids(None,
2647
 
            wt, 'E-id')
 
2835
        merger = _mod_merge.Merger.from_revision_ids(wt, 'E-id')
2648
2836
        merger.merge_type = _mod_merge.Merge3Merger
2649
2837
        merge_obj = merger.make_merger()
2650
2838
        entries = list(merge_obj._entries_lca())
2659
2847
        # Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2660
2848
        # 'tree-reference'
2661
2849
        wt = self.make_branch_and_tree('tree',
2662
 
            format='dirstate-with-subtree')
 
2850
            format='development-subtree')
2663
2851
        wt.lock_write()
2664
2852
        self.addCleanup(wt.unlock)
2665
2853
        sub_tree = self.make_branch_and_tree('tree/sub',
2666
 
            format='dirstate-with-subtree')
 
2854
            format='development-subtree')
2667
2855
        wt.set_root_id('a-root-id')
2668
2856
        sub_tree.set_root_id('sub-tree-root')
2669
2857
        self.build_tree_contents([('tree/sub/file', 'text1')])
2688
2876
        wt.branch.set_last_revision_info(2, 'B-id')
2689
2877
        wt.commit('D', rev_id='D-id', recursive=None)
2690
2878
 
2691
 
        merger = _mod_merge.Merger.from_revision_ids(None,
2692
 
            wt, 'E-id')
 
2879
        merger = _mod_merge.Merger.from_revision_ids(wt, 'E-id')
2693
2880
        merger.merge_type = _mod_merge.Merge3Merger
2694
2881
        merge_obj = merger.make_merger()
2695
2882
        entries = list(merge_obj._entries_lca())
2840
3027
 
2841
3028
    def get_merger_factory(self):
2842
3029
        # Allows  the inner methods to access the test attributes
2843
 
        test = self
 
3030
        calls = self.calls
2844
3031
 
2845
3032
        class FooMerger(_mod_merge.ConfigurableFileMerger):
2846
3033
            name_prefix = "foo"
2847
3034
            default_files = ['bar']
2848
3035
 
2849
3036
            def merge_text(self, params):
2850
 
                test.calls.append('merge_text')
 
3037
                calls.append('merge_text')
2851
3038
                return ('not_applicable', None)
2852
3039
 
2853
3040
        def factory(merger):
2917
3104
        conflicts = builder.merge()
2918
3105
        # The hook should not call the merge_text() method
2919
3106
        self.assertEqual([], self.calls)
 
3107
 
 
3108
 
 
3109
class TestMergeIntoBase(tests.TestCaseWithTransport):
 
3110
 
 
3111
    def setup_simple_branch(self, relpath, shape=None, root_id=None):
 
3112
        """One commit, containing tree specified by optional shape.
 
3113
        
 
3114
        Default is empty tree (just root entry).
 
3115
        """
 
3116
        if root_id is None:
 
3117
            root_id = '%s-root-id' % (relpath,)
 
3118
        wt = self.make_branch_and_tree(relpath)
 
3119
        wt.set_root_id(root_id)
 
3120
        if shape is not None:
 
3121
            adjusted_shape = [relpath + '/' + elem for elem in shape]
 
3122
            self.build_tree(adjusted_shape)
 
3123
            ids = ['%s-%s-id' % (relpath, basename(elem.rstrip('/')))
 
3124
                   for elem in shape]
 
3125
            wt.add(shape, ids=ids)
 
3126
        rev_id = 'r1-%s' % (relpath,)
 
3127
        wt.commit("Initial commit of %s" % (relpath,), rev_id=rev_id)
 
3128
        self.assertEqual(root_id, wt.path2id(''))
 
3129
        return wt
 
3130
 
 
3131
    def setup_two_branches(self, custom_root_ids=True):
 
3132
        """Setup 2 branches, one will be a library, the other a project."""
 
3133
        if custom_root_ids:
 
3134
            root_id = None
 
3135
        else:
 
3136
            root_id = inventory.ROOT_ID
 
3137
        project_wt = self.setup_simple_branch(
 
3138
            'project', ['README', 'dir/', 'dir/file.c'],
 
3139
            root_id)
 
3140
        lib_wt = self.setup_simple_branch(
 
3141
            'lib1', ['README', 'Makefile', 'foo.c'], root_id)
 
3142
 
 
3143
        return project_wt, lib_wt
 
3144
 
 
3145
    def do_merge_into(self, location, merge_as):
 
3146
        """Helper for using MergeIntoMerger.
 
3147
        
 
3148
        :param location: location of directory to merge from, either the
 
3149
            location of a branch or of a path inside a branch.
 
3150
        :param merge_as: the path in a tree to add the new directory as.
 
3151
        :returns: the conflicts from 'do_merge'.
 
3152
        """
 
3153
        operation = cleanup.OperationWithCleanups(self._merge_into)
 
3154
        return operation.run(location, merge_as)
 
3155
 
 
3156
    def _merge_into(self, op, location, merge_as):
 
3157
        # Open and lock the various tree and branch objects
 
3158
        wt, subdir_relpath = WorkingTree.open_containing(merge_as)
 
3159
        op.add_cleanup(wt.lock_write().unlock)
 
3160
        branch_to_merge, subdir_to_merge = _mod_branch.Branch.open_containing(
 
3161
            location)
 
3162
        op.add_cleanup(branch_to_merge.lock_read().unlock)
 
3163
        other_tree = branch_to_merge.basis_tree()
 
3164
        op.add_cleanup(other_tree.lock_read().unlock)
 
3165
        # Perform the merge
 
3166
        merger = _mod_merge.MergeIntoMerger(this_tree=wt, other_tree=other_tree,
 
3167
            other_branch=branch_to_merge, target_subdir=subdir_relpath,
 
3168
            source_subpath=subdir_to_merge)
 
3169
        merger.set_base_revision(_mod_revision.NULL_REVISION, branch_to_merge)
 
3170
        conflicts = merger.do_merge()
 
3171
        merger.set_pending()
 
3172
        return conflicts
 
3173
 
 
3174
    def assertTreeEntriesEqual(self, expected_entries, tree):
 
3175
        """Assert that 'tree' contains the expected inventory entries.
 
3176
 
 
3177
        :param expected_entries: sequence of (path, file-id) pairs.
 
3178
        """
 
3179
        files = [(path, ie.file_id) for path, ie in tree.iter_entries_by_dir()]
 
3180
        self.assertEqual(expected_entries, files)
 
3181
 
 
3182
 
 
3183
class TestMergeInto(TestMergeIntoBase):
 
3184
 
 
3185
    def test_newdir_with_unique_roots(self):
 
3186
        """Merge a branch with a unique root into a new directory."""
 
3187
        project_wt, lib_wt = self.setup_two_branches()
 
3188
        self.do_merge_into('lib1', 'project/lib1')
 
3189
        project_wt.lock_read()
 
3190
        self.addCleanup(project_wt.unlock)
 
3191
        # The r1-lib1 revision should be merged into this one
 
3192
        self.assertEqual(['r1-project', 'r1-lib1'], project_wt.get_parent_ids())
 
3193
        self.assertTreeEntriesEqual(
 
3194
            [('', 'project-root-id'),
 
3195
             ('README', 'project-README-id'),
 
3196
             ('dir', 'project-dir-id'),
 
3197
             ('lib1', 'lib1-root-id'),
 
3198
             ('dir/file.c', 'project-file.c-id'),
 
3199
             ('lib1/Makefile', 'lib1-Makefile-id'),
 
3200
             ('lib1/README', 'lib1-README-id'),
 
3201
             ('lib1/foo.c', 'lib1-foo.c-id'),
 
3202
            ], project_wt)
 
3203
 
 
3204
    def test_subdir(self):
 
3205
        """Merge a branch into a subdirectory of an existing directory."""
 
3206
        project_wt, lib_wt = self.setup_two_branches()
 
3207
        self.do_merge_into('lib1', 'project/dir/lib1')
 
3208
        project_wt.lock_read()
 
3209
        self.addCleanup(project_wt.unlock)
 
3210
        # The r1-lib1 revision should be merged into this one
 
3211
        self.assertEqual(['r1-project', 'r1-lib1'], project_wt.get_parent_ids())
 
3212
        self.assertTreeEntriesEqual(
 
3213
            [('', 'project-root-id'),
 
3214
             ('README', 'project-README-id'),
 
3215
             ('dir', 'project-dir-id'),
 
3216
             ('dir/file.c', 'project-file.c-id'),
 
3217
             ('dir/lib1', 'lib1-root-id'),
 
3218
             ('dir/lib1/Makefile', 'lib1-Makefile-id'),
 
3219
             ('dir/lib1/README', 'lib1-README-id'),
 
3220
             ('dir/lib1/foo.c', 'lib1-foo.c-id'),
 
3221
            ], project_wt)
 
3222
 
 
3223
    def test_newdir_with_repeat_roots(self):
 
3224
        """If the file-id of the dir to be merged already exists a new ID will
 
3225
        be allocated to let the merge happen.
 
3226
        """
 
3227
        project_wt, lib_wt = self.setup_two_branches(custom_root_ids=False)
 
3228
        root_id = project_wt.path2id('')
 
3229
        self.do_merge_into('lib1', 'project/lib1')
 
3230
        project_wt.lock_read()
 
3231
        self.addCleanup(project_wt.unlock)
 
3232
        # The r1-lib1 revision should be merged into this one
 
3233
        self.assertEqual(['r1-project', 'r1-lib1'], project_wt.get_parent_ids())
 
3234
        new_lib1_id = project_wt.path2id('lib1')
 
3235
        self.assertNotEqual(None, new_lib1_id)
 
3236
        self.assertTreeEntriesEqual(
 
3237
            [('', root_id),
 
3238
             ('README', 'project-README-id'),
 
3239
             ('dir', 'project-dir-id'),
 
3240
             ('lib1', new_lib1_id),
 
3241
             ('dir/file.c', 'project-file.c-id'),
 
3242
             ('lib1/Makefile', 'lib1-Makefile-id'),
 
3243
             ('lib1/README', 'lib1-README-id'),
 
3244
             ('lib1/foo.c', 'lib1-foo.c-id'),
 
3245
            ], project_wt)
 
3246
 
 
3247
    def test_name_conflict(self):
 
3248
        """When the target directory name already exists a conflict is
 
3249
        generated and the original directory is renamed to foo.moved.
 
3250
        """
 
3251
        dest_wt = self.setup_simple_branch('dest', ['dir/', 'dir/file.txt'])
 
3252
        src_wt = self.setup_simple_branch('src', ['README'])
 
3253
        conflicts = self.do_merge_into('src', 'dest/dir')
 
3254
        self.assertEqual(1, conflicts)
 
3255
        dest_wt.lock_read()
 
3256
        self.addCleanup(dest_wt.unlock)
 
3257
        # The r1-lib1 revision should be merged into this one
 
3258
        self.assertEqual(['r1-dest', 'r1-src'], dest_wt.get_parent_ids())
 
3259
        self.assertTreeEntriesEqual(
 
3260
            [('', 'dest-root-id'),
 
3261
             ('dir', 'src-root-id'),
 
3262
             ('dir.moved', 'dest-dir-id'),
 
3263
             ('dir/README', 'src-README-id'),
 
3264
             ('dir.moved/file.txt', 'dest-file.txt-id'),
 
3265
            ], dest_wt)
 
3266
 
 
3267
    def test_file_id_conflict(self):
 
3268
        """A conflict is generated if the merge-into adds a file (or other
 
3269
        inventory entry) with a file-id that already exists in the target tree.
 
3270
        """
 
3271
        dest_wt = self.setup_simple_branch('dest', ['file.txt'])
 
3272
        # Make a second tree with a file-id that will clash with file.txt in
 
3273
        # dest.
 
3274
        src_wt = self.make_branch_and_tree('src')
 
3275
        self.build_tree(['src/README'])
 
3276
        src_wt.add(['README'], ids=['dest-file.txt-id'])
 
3277
        src_wt.commit("Rev 1 of src.", rev_id='r1-src')
 
3278
        conflicts = self.do_merge_into('src', 'dest/dir')
 
3279
        # This is an edge case that shouldn't happen to users very often.  So
 
3280
        # we don't care really about the exact presentation of the conflict,
 
3281
        # just that there is one.
 
3282
        self.assertEqual(1, conflicts)
 
3283
 
 
3284
    def test_only_subdir(self):
 
3285
        """When the location points to just part of a tree, merge just that
 
3286
        subtree.
 
3287
        """
 
3288
        dest_wt = self.setup_simple_branch('dest')
 
3289
        src_wt = self.setup_simple_branch(
 
3290
            'src', ['hello.txt', 'dir/', 'dir/foo.c'])
 
3291
        conflicts = self.do_merge_into('src/dir', 'dest/dir')
 
3292
        dest_wt.lock_read()
 
3293
        self.addCleanup(dest_wt.unlock)
 
3294
        # The r1-lib1 revision should NOT be merged into this one (this is a
 
3295
        # partial merge).
 
3296
        self.assertEqual(['r1-dest'], dest_wt.get_parent_ids())
 
3297
        self.assertTreeEntriesEqual(
 
3298
            [('', 'dest-root-id'),
 
3299
             ('dir', 'src-dir-id'),
 
3300
             ('dir/foo.c', 'src-foo.c-id'),
 
3301
            ], dest_wt)
 
3302
 
 
3303
    def test_only_file(self):
 
3304
        """An edge case: merge just one file, not a whole dir."""
 
3305
        dest_wt = self.setup_simple_branch('dest')
 
3306
        two_file_wt = self.setup_simple_branch(
 
3307
            'two-file', ['file1.txt', 'file2.txt'])
 
3308
        conflicts = self.do_merge_into('two-file/file1.txt', 'dest/file1.txt')
 
3309
        dest_wt.lock_read()
 
3310
        self.addCleanup(dest_wt.unlock)
 
3311
        # The r1-lib1 revision should NOT be merged into this one
 
3312
        self.assertEqual(['r1-dest'], dest_wt.get_parent_ids())
 
3313
        self.assertTreeEntriesEqual(
 
3314
            [('', 'dest-root-id'), ('file1.txt', 'two-file-file1.txt-id')],
 
3315
            dest_wt)
 
3316
 
 
3317
    def test_no_such_source_path(self):
 
3318
        """PathNotInTree is raised if the specified path in the source tree
 
3319
        does not exist.
 
3320
        """
 
3321
        dest_wt = self.setup_simple_branch('dest')
 
3322
        two_file_wt = self.setup_simple_branch('src', ['dir/'])
 
3323
        self.assertRaises(_mod_merge.PathNotInTree, self.do_merge_into,
 
3324
            'src/no-such-dir', 'dest/foo')
 
3325
        dest_wt.lock_read()
 
3326
        self.addCleanup(dest_wt.unlock)
 
3327
        # The dest tree is unmodified.
 
3328
        self.assertEqual(['r1-dest'], dest_wt.get_parent_ids())
 
3329
        self.assertTreeEntriesEqual([('', 'dest-root-id')], dest_wt)
 
3330
 
 
3331
    def test_no_such_target_path(self):
 
3332
        """PathNotInTree is also raised if the specified path in the target
 
3333
        tree does not exist.
 
3334
        """
 
3335
        dest_wt = self.setup_simple_branch('dest')
 
3336
        two_file_wt = self.setup_simple_branch('src', ['file.txt'])
 
3337
        self.assertRaises(_mod_merge.PathNotInTree, self.do_merge_into,
 
3338
            'src', 'dest/no-such-dir/foo')
 
3339
        dest_wt.lock_read()
 
3340
        self.addCleanup(dest_wt.unlock)
 
3341
        # The dest tree is unmodified.
 
3342
        self.assertEqual(['r1-dest'], dest_wt.get_parent_ids())
 
3343
        self.assertTreeEntriesEqual([('', 'dest-root-id')], dest_wt)
 
3344
 
 
3345
 
 
3346
class TestMergeHooks(TestCaseWithTransport):
 
3347
 
 
3348
    def setUp(self):
 
3349
        super(TestMergeHooks, self).setUp()
 
3350
        self.tree_a = self.make_branch_and_tree('tree_a')
 
3351
        self.build_tree_contents([('tree_a/file', 'content_1')])
 
3352
        self.tree_a.add('file', 'file-id')
 
3353
        self.tree_a.commit('added file')
 
3354
 
 
3355
        self.tree_b = self.tree_a.controldir.sprout('tree_b').open_workingtree()
 
3356
        self.build_tree_contents([('tree_b/file', 'content_2')])
 
3357
        self.tree_b.commit('modify file')
 
3358
 
 
3359
    def test_pre_merge_hook_inject_different_tree(self):
 
3360
        tree_c = self.tree_b.controldir.sprout('tree_c').open_workingtree()
 
3361
        self.build_tree_contents([('tree_c/file', 'content_3')])
 
3362
        tree_c.commit("more content")
 
3363
        calls = []
 
3364
        def factory(merger):
 
3365
            self.assertIsInstance(merger, _mod_merge.Merge3Merger)
 
3366
            merger.other_tree = tree_c
 
3367
            calls.append(merger)
 
3368
        _mod_merge.Merger.hooks.install_named_hook('pre_merge',
 
3369
                                                   factory, 'test factory')
 
3370
        self.tree_a.merge_from_branch(self.tree_b.branch)
 
3371
 
 
3372
        self.assertFileEqual("content_3", 'tree_a/file')
 
3373
        self.assertLength(1, calls)
 
3374
 
 
3375
    def test_post_merge_hook_called(self):
 
3376
        calls = []
 
3377
        def factory(merger):
 
3378
            self.assertIsInstance(merger, _mod_merge.Merge3Merger)
 
3379
            calls.append(merger)
 
3380
        _mod_merge.Merger.hooks.install_named_hook('post_merge',
 
3381
                                                   factory, 'test factory')
 
3382
 
 
3383
        self.tree_a.merge_from_branch(self.tree_b.branch)
 
3384
 
 
3385
        self.assertFileEqual("content_2", 'tree_a/file')
 
3386
        self.assertLength(1, calls)