← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-02-03 09:04:38 UTC
  • mfrom: (4999.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100203090438-2qn9wus9kyyfyyek
(vila) Merge 2.1 to trunk,
        including fix for bug #515597 (per-file merge hook typo)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
295
295
        tree_a.commit('commit 2')
296
296
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
297
297
        tree_b.rename_one('file_1', 'renamed')
298
 
        merger = _mod_merge.Merger.from_uncommitted(tree_a, tree_b)
 
298
        merger = _mod_merge.Merger.from_uncommitted(tree_a, tree_b,
 
299
                                                    progress.DummyProgress())
299
300
        merger.merge_type = _mod_merge.Merge3Merger
300
301
        merger.do_merge()
301
302
        self.assertEqual(tree_a.get_parent_ids(), [tree_b.last_revision()])
309
310
        tree_a.commit('commit 2')
310
311
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
311
312
        tree_b.rename_one('file_1', 'renamed')
312
 
        merger = _mod_merge.Merger.from_uncommitted(tree_a, tree_b)
 
313
        merger = _mod_merge.Merger.from_uncommitted(tree_a, tree_b,
 
314
                                                    progress.DummyProgress())
313
315
        merger.merge_type = _mod_merge.WeaveMerger
314
316
        merger.do_merge()
315
317
        self.assertEqual(tree_a.get_parent_ids(), [tree_b.last_revision()])
316
318
 
 
319
    def test_Merger_defaults_to_DummyProgress(self):
 
320
        branch = self.make_branch('branch')
 
321
        merger = _mod_merge.Merger(branch, pb=None)
 
322
        self.assertIsInstance(merger._pb, progress.DummyProgress)
 
323
 
317
324
    def prepare_cherrypick(self):
318
325
        """Prepare a pair of trees for cherrypicking tests.
319
326
 
340
347
 
341
348
    def test_weave_cherrypick(self):
342
349
        this_tree, other_tree = self.prepare_cherrypick()
343
 
        merger = _mod_merge.Merger.from_revision_ids(None,
 
350
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
344
351
            this_tree, 'rev3b', 'rev2b', other_tree.branch)
345
352
        merger.merge_type = _mod_merge.WeaveMerger
346
353
        merger.do_merge()
348
355
 
349
356
    def test_weave_cannot_reverse_cherrypick(self):
350
357
        this_tree, other_tree = self.prepare_cherrypick()
351
 
        merger = _mod_merge.Merger.from_revision_ids(None,
 
358
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
352
359
            this_tree, 'rev2b', 'rev3b', other_tree.branch)
353
360
        merger.merge_type = _mod_merge.WeaveMerger
354
361
        self.assertRaises(errors.CannotReverseCherrypick, merger.do_merge)
355
362
 
356
363
    def test_merge3_can_reverse_cherrypick(self):
357
364
        this_tree, other_tree = self.prepare_cherrypick()
358
 
        merger = _mod_merge.Merger.from_revision_ids(None,
 
365
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
359
366
            this_tree, 'rev2b', 'rev3b', other_tree.branch)
360
367
        merger.merge_type = _mod_merge.Merge3Merger
361
368
        merger.do_merge()
373
380
        this_tree.lock_write()
374
381
        self.addCleanup(this_tree.unlock)
375
382
 
376
 
        merger = _mod_merge.Merger.from_revision_ids(None,
 
383
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
377
384
            this_tree, 'rev3b', 'rev2b', other_tree.branch)
378
385
        merger.merge_type = _mod_merge.Merge3Merger
379
386
        merger.do_merge()
392
399
        other_tree.commit('rev2', rev_id='rev2b')
393
400
        this_tree.lock_write()
394
401
        self.addCleanup(this_tree.unlock)
395
 
        merger = _mod_merge.Merger.from_revision_ids(None,
 
402
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress,
396
403
            this_tree, 'rev2b', other_branch=other_tree.branch)
397
404
        merger.merge_type = _mod_merge.Merge3Merger
398
405
        tree_merger = merger.make_merger()
412
419
        other_tree.commit('rev2', rev_id='rev2b')
413
420
        this_tree.lock_write()
414
421
        self.addCleanup(this_tree.unlock)
415
 
        merger = _mod_merge.Merger.from_revision_ids(None,
 
422
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
416
423
            this_tree, 'rev2b', other_branch=other_tree.branch)
417
424
        merger.merge_type = _mod_merge.Merge3Merger
418
425
        tree_merger = merger.make_merger()
442
449
        other_tree.commit('rev2', rev_id='rev2b')
443
450
        this_tree.lock_write()
444
451
        self.addCleanup(this_tree.unlock)
445
 
        merger = _mod_merge.Merger.from_revision_ids(None,
 
452
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
446
453
            this_tree, 'rev2b', other_branch=other_tree.branch)
447
454
        merger.merge_type = _mod_merge.Merge3Merger
448
455
        tree_merger = merger.make_merger()
1198
1205
        mem_tree = memorytree.MemoryTree.create_on_branch(builder.get_branch())
1199
1206
        mem_tree.lock_write()
1200
1207
        self.addCleanup(mem_tree.unlock)
1201
 
        merger = _mod_merge.Merger.from_revision_ids(None,
 
1208
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
1202
1209
            mem_tree, other_revision_id)
1203
1210
        merger.set_interesting_files(interesting_files)
1204
1211
        # It seems there is no matching function for set_interesting_ids
1978
1985
 
1979
1986
    def do_merge(self, builder, other_revision_id):
1980
1987
        wt = self.get_wt_from_builder(builder)
1981
 
        merger = _mod_merge.Merger.from_revision_ids(None,
 
1988
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
1982
1989
            wt, other_revision_id)
1983
1990
        merger.merge_type = _mod_merge.Merge3Merger
1984
1991
        return wt, merger.do_merge()
2244
2251
        wt.commit('D merges B & C', rev_id='D-id')
2245
2252
        self.assertEqual('barry', wt.id2path('foo-id'))
2246
2253
        # Check the output of the Merger object directly
2247
 
        merger = _mod_merge.Merger.from_revision_ids(None,
 
2254
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
2248
2255
            wt, 'F-id')
2249
2256
        merger.merge_type = _mod_merge.Merge3Merger
2250
2257
        merge_obj = merger.make_merger()
2300
2307
        wt.commit('F foo => bing', rev_id='F-id')
2301
2308
 
2302
2309
        # Check the output of the Merger object directly
2303
 
        merger = _mod_merge.Merger.from_revision_ids(None,
 
2310
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
2304
2311
            wt, 'E-id')
2305
2312
        merger.merge_type = _mod_merge.Merge3Merger
2306
2313
        merge_obj = merger.make_merger()
2351
2358
        list(wt.iter_changes(wt.basis_tree()))
2352
2359
        wt.commit('D merges B & C, makes it a file', rev_id='D-id')
2353
2360
 
2354
 
        merger = _mod_merge.Merger.from_revision_ids(None,
 
2361
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
2355
2362
            wt, 'E-id')
2356
2363
        merger.merge_type = _mod_merge.Merge3Merger
2357
2364
        merge_obj = merger.make_merger()
2566
2573
        wt.branch.set_last_revision_info(2, 'B-id')
2567
2574
        wt.commit('D', rev_id='D-id', recursive=None)
2568
2575
 
2569
 
        merger = _mod_merge.Merger.from_revision_ids(None,
 
2576
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
2570
2577
            wt, 'E-id')
2571
2578
        merger.merge_type = _mod_merge.Merge3Merger
2572
2579
        merge_obj = merger.make_merger()
2603
2610
        wt.branch.set_last_revision_info(2, 'B-id')
2604
2611
        wt.commit('D', rev_id='D-id', recursive=None)
2605
2612
 
2606
 
        merger = _mod_merge.Merger.from_revision_ids(None,
 
2613
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
2607
2614
            wt, 'E-id')
2608
2615
        merger.merge_type = _mod_merge.Merge3Merger
2609
2616
        merge_obj = merger.make_merger()
2643
2650
        wt.branch.set_last_revision_info(2, 'B-id')
2644
2651
        wt.commit('D', rev_id='D-id', recursive=None)
2645
2652
 
2646
 
        merger = _mod_merge.Merger.from_revision_ids(None,
 
2653
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
2647
2654
            wt, 'E-id')
2648
2655
        merger.merge_type = _mod_merge.Merge3Merger
2649
2656
        merge_obj = merger.make_merger()
2688
2695
        wt.branch.set_last_revision_info(2, 'B-id')
2689
2696
        wt.commit('D', rev_id='D-id', recursive=None)
2690
2697
 
2691
 
        merger = _mod_merge.Merger.from_revision_ids(None,
 
2698
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
2692
2699
            wt, 'E-id')
2693
2700
        merger.merge_type = _mod_merge.Merge3Merger
2694
2701
        merge_obj = merger.make_merger()