/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

• browse files at revision 4918
• compare with another revision
• download diff
• download tarball
• view history from revision 4918

• reverse the comparison (4918 to 5200.3.2)
• stop comparing with revision 5200.3.2

Show diffs side-by-side

added

removed

bzrlib/tests/test_merge.py

1

 

# Copyright (C) 2005-2010 Canonical Ltd

 

1

# Copyright (C) 2005, 2006, 2007 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

33

33

from bzrlib.errors import UnrelatedBranches, NoCommits

34

34

from bzrlib.merge import transform_tree, merge_inner, _PlanMerge

35

35

from bzrlib.osutils import pathjoin, file_kind

36

 

from bzrlib.tests import (

37

 

    TestCaseWithMemoryTransport,

38

 

    TestCaseWithTransport,

39

 

    test_merge_core,

40

 

    )

 

36

from bzrlib.tests import TestCaseWithTransport, TestCaseWithMemoryTransport

41

37

from bzrlib.workingtree import WorkingTree

42

38

 

43

39

 

154

150

        log = StringIO()

155

151

        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(),

156

152

                    this_tree=tree_b, ignore_zero=True)

157

 

        self.failUnless('All changes applied successfully.\n' not in

158

 

            self.get_log())

 

153

        log = self._get_log(keep_log_file=True)

 

154

        self.failUnless('All changes applied successfully.\n' not in log)

159

155

        tree_b.revert()

160

156

        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(),

161

157

                    this_tree=tree_b, ignore_zero=False)

162

 

        self.failUnless('All changes applied successfully.\n' in self.get_log())

 

158

        log = self._get_log(keep_log_file=True)

 

159

        self.failUnless('All changes applied successfully.\n' in log)

163

160

 

164

161

    def test_merge_inner_conflicts(self):

165

162

        tree_a = self.make_branch_and_tree('a')

295

292

        tree_a.commit('commit 2')

296

293

        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()

297

294

        tree_b.rename_one('file_1', 'renamed')

298

 

        merger = _mod_merge.Merger.from_uncommitted(tree_a, tree_b)

 

295

        merger = _mod_merge.Merger.from_uncommitted(tree_a, tree_b,

 

296

                                                    progress.DummyProgress())

299

297

        merger.merge_type = _mod_merge.Merge3Merger

300

298

        merger.do_merge()

301

299

        self.assertEqual(tree_a.get_parent_ids(), [tree_b.last_revision()])

309

307

        tree_a.commit('commit 2')

310

308

        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()

311

309

        tree_b.rename_one('file_1', 'renamed')

312

 

        merger = _mod_merge.Merger.from_uncommitted(tree_a, tree_b)

 

310

        merger = _mod_merge.Merger.from_uncommitted(tree_a, tree_b,

 

311

                                                    progress.DummyProgress())

313

312

        merger.merge_type = _mod_merge.WeaveMerger

314

313

        merger.do_merge()

315

314

        self.assertEqual(tree_a.get_parent_ids(), [tree_b.last_revision()])

316

315

 

 

316

    def test_Merger_defaults_to_DummyProgress(self):

 

317

        branch = self.make_branch('branch')

 

318

        merger = _mod_merge.Merger(branch, pb=None)

 

319

        self.assertIsInstance(merger._pb, progress.DummyProgress)

 

320

 

317

321

    def prepare_cherrypick(self):

318

322

        """Prepare a pair of trees for cherrypicking tests.

319

323

 

340

344

 

341

345

    def test_weave_cherrypick(self):

342

346

        this_tree, other_tree = self.prepare_cherrypick()

343

 

        merger = _mod_merge.Merger.from_revision_ids(None,

 

347

        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),

344

348

            this_tree, 'rev3b', 'rev2b', other_tree.branch)

345

349

        merger.merge_type = _mod_merge.WeaveMerger

346

350

        merger.do_merge()

348

352

 

349

353

    def test_weave_cannot_reverse_cherrypick(self):

350

354

        this_tree, other_tree = self.prepare_cherrypick()

351

 

        merger = _mod_merge.Merger.from_revision_ids(None,

 

355

        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),

352

356

            this_tree, 'rev2b', 'rev3b', other_tree.branch)

353

357

        merger.merge_type = _mod_merge.WeaveMerger

354

358

        self.assertRaises(errors.CannotReverseCherrypick, merger.do_merge)

355

359

 

356

360

    def test_merge3_can_reverse_cherrypick(self):

357

361

        this_tree, other_tree = self.prepare_cherrypick()

358

 

        merger = _mod_merge.Merger.from_revision_ids(None,

 

362

        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),

359

363

            this_tree, 'rev2b', 'rev3b', other_tree.branch)

360

364

        merger.merge_type = _mod_merge.Merge3Merger

361

365

        merger.do_merge()

373

377

        this_tree.lock_write()

374

378

        self.addCleanup(this_tree.unlock)

375

379

 

376

 

        merger = _mod_merge.Merger.from_revision_ids(None,

 

380

        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),

377

381

            this_tree, 'rev3b', 'rev2b', other_tree.branch)

378

382

        merger.merge_type = _mod_merge.Merge3Merger

379

383

        merger.do_merge()

392

396

        other_tree.commit('rev2', rev_id='rev2b')

393

397

        this_tree.lock_write()

394

398

        self.addCleanup(this_tree.unlock)

395

 

        merger = _mod_merge.Merger.from_revision_ids(None,

 

399

        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress,

396

400

            this_tree, 'rev2b', other_branch=other_tree.branch)

397

401

        merger.merge_type = _mod_merge.Merge3Merger

398

402

        tree_merger = merger.make_merger()

412

416

        other_tree.commit('rev2', rev_id='rev2b')

413

417

        this_tree.lock_write()

414

418

        self.addCleanup(this_tree.unlock)

415

 

        merger = _mod_merge.Merger.from_revision_ids(None,

 

419

        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),

416

420

            this_tree, 'rev2b', other_branch=other_tree.branch)

417

421

        merger.merge_type = _mod_merge.Merge3Merger

418

422

        tree_merger = merger.make_merger()

442

446

        other_tree.commit('rev2', rev_id='rev2b')

443

447

        this_tree.lock_write()

444

448

        self.addCleanup(this_tree.unlock)

445

 

        merger = _mod_merge.Merger.from_revision_ids(None,

 

449

        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),

446

450

            this_tree, 'rev2b', other_branch=other_tree.branch)

447

451

        merger.merge_type = _mod_merge.Merge3Merger

448

452

        tree_merger = merger.make_merger()

1198

1202

        mem_tree = memorytree.MemoryTree.create_on_branch(builder.get_branch())

1199

1203

        mem_tree.lock_write()

1200

1204

        self.addCleanup(mem_tree.unlock)

1201

 

        merger = _mod_merge.Merger.from_revision_ids(None,

 

1205

        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),

1202

1206

            mem_tree, other_revision_id)

1203

1207

        merger.set_interesting_files(interesting_files)

1204

1208

        # It seems there is no matching function for set_interesting_ids

1978

1982

 

1979

1983

    def do_merge(self, builder, other_revision_id):

1980

1984

        wt = self.get_wt_from_builder(builder)

1981

 

        merger = _mod_merge.Merger.from_revision_ids(None,

 

1985

        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),

1982

1986

            wt, other_revision_id)

1983

1987

        merger.merge_type = _mod_merge.Merge3Merger

1984

1988

        return wt, merger.do_merge()

2244

2248

        wt.commit('D merges B & C', rev_id='D-id')

2245

2249

        self.assertEqual('barry', wt.id2path('foo-id'))

2246

2250

        # Check the output of the Merger object directly

2247

 

        merger = _mod_merge.Merger.from_revision_ids(None,

 

2251

        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),

2248

2252

            wt, 'F-id')

2249

2253

        merger.merge_type = _mod_merge.Merge3Merger

2250

2254

        merge_obj = merger.make_merger()

2300

2304

        wt.commit('F foo => bing', rev_id='F-id')

2301

2305

 

2302

2306

        # Check the output of the Merger object directly

2303

 

        merger = _mod_merge.Merger.from_revision_ids(None,

 

2307

        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),

2304

2308

            wt, 'E-id')

2305

2309

        merger.merge_type = _mod_merge.Merge3Merger

2306

2310

        merge_obj = merger.make_merger()

2351

2355

        list(wt.iter_changes(wt.basis_tree()))

2352

2356

        wt.commit('D merges B & C, makes it a file', rev_id='D-id')

2353

2357

 

2354

 

        merger = _mod_merge.Merger.from_revision_ids(None,

 

2358

        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),

2355

2359

            wt, 'E-id')

2356

2360

        merger.merge_type = _mod_merge.Merge3Merger

2357

2361

        merge_obj = merger.make_merger()

2566

2570

        wt.branch.set_last_revision_info(2, 'B-id')

2567

2571

        wt.commit('D', rev_id='D-id', recursive=None)

2568

2572

 

2569

 

        merger = _mod_merge.Merger.from_revision_ids(None,

 

2573

        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),

2570

2574

            wt, 'E-id')

2571

2575

        merger.merge_type = _mod_merge.Merge3Merger

2572

2576

        merge_obj = merger.make_merger()

2603

2607

        wt.branch.set_last_revision_info(2, 'B-id')

2604

2608

        wt.commit('D', rev_id='D-id', recursive=None)

2605

2609

 

2606

 

        merger = _mod_merge.Merger.from_revision_ids(None,

 

2610

        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),

2607

2611

            wt, 'E-id')

2608

2612

        merger.merge_type = _mod_merge.Merge3Merger

2609

2613

        merge_obj = merger.make_merger()

2643

2647

        wt.branch.set_last_revision_info(2, 'B-id')

2644

2648

        wt.commit('D', rev_id='D-id', recursive=None)

2645

2649

 

2646

 

        merger = _mod_merge.Merger.from_revision_ids(None,

 

2650

        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),

2647

2651

            wt, 'E-id')

2648

2652

        merger.merge_type = _mod_merge.Merge3Merger

2649

2653

        merge_obj = merger.make_merger()

2688

2692

        wt.branch.set_last_revision_info(2, 'B-id')

2689

2693

        wt.commit('D', rev_id='D-id', recursive=None)

2690

2694

 

2691

 

        merger = _mod_merge.Merger.from_revision_ids(None,

 

2695

        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),

2692

2696

            wt, 'E-id')

2693

2697

        merger.merge_type = _mod_merge.Merge3Merger

2694

2698

        merge_obj = merger.make_merger()

2830

2834

            'bval', ['lca1val', 'lca2val', 'lca2val'], 'oval', 'tval')

2831

2835

        self.assertLCAMultiWay('conflict',

2832

2836

            'bval', ['lca1val', 'lca2val', 'lca3val'], 'oval', 'tval')

2833

 

 

2834

 

 

2835

 

class TestConfigurableFileMerger(tests.TestCaseWithTransport):

2836

 

 

2837

 

    def setUp(self):

2838

 

        super(TestConfigurableFileMerger, self).setUp()

2839

 

        self.calls = []

2840

 

 

2841

 

    def get_merger_factory(self):

2842

 

        # Allows  the inner methods to access the test attributes

2843

 

        test = self

2844

 

 

2845

 

        class FooMerger(_mod_merge.ConfigurableFileMerger):

2846

 

            name_prefix = "foo"

2847

 

            default_files = ['bar']

2848

 

 

2849

 

            def merge_text(self, params):

2850

 

                test.calls.append('merge_text')

2851

 

                return ('not_applicable', None)

2852

 

 

2853

 

        def factory(merger):

2854

 

            result = FooMerger(merger)

2855

 

            # Make sure we start with a clean slate

2856

 

            self.assertEqual(None, result.affected_files)

2857

 

            # Track the original merger

2858

 

            self.merger = result

2859

 

            return result

2860

 

 

2861

 

        return factory

2862

 

 

2863

 

    def _install_hook(self, factory):

2864

 

        _mod_merge.Merger.hooks.install_named_hook('merge_file_content',

2865

 

                                                   factory, 'test factory')

2866

 

 

2867

 

    def make_builder(self):

2868

 

        builder = test_merge_core.MergeBuilder(self.test_base_dir)

2869

 

        self.addCleanup(builder.cleanup)

2870

 

        return builder

2871

 

 

2872

 

    def make_text_conflict(self, file_name='bar'):

2873

 

        factory = self.get_merger_factory()

2874

 

        self._install_hook(factory)

2875

 

        builder = self.make_builder()

2876

 

        builder.add_file('bar-id', builder.tree_root, file_name, 'text1', True)

2877

 

        builder.change_contents('bar-id', other='text4', this='text3')

2878

 

        return builder

2879

 

 

2880

 

    def make_kind_change(self):

2881

 

        factory = self.get_merger_factory()

2882

 

        self._install_hook(factory)

2883

 

        builder = self.make_builder()

2884

 

        builder.add_file('bar-id', builder.tree_root, 'bar', 'text1', True,

2885

 

                         this=False)

2886

 

        builder.add_dir('bar-dir', builder.tree_root, 'bar-id',

2887

 

                        base=False, other=False)

2888

 

        return builder

2889

 

 

2890

 

    def test_uses_this_branch(self):

2891

 

        builder = self.make_text_conflict()

2892

 

        tt = builder.make_preview_transform()

2893

 

        self.addCleanup(tt.finalize)

2894

 

 

2895

 

    def test_affected_files_cached(self):

2896

 

        """Ensures that the config variable is cached"""

2897

 

        builder = self.make_text_conflict()

2898

 

        conflicts = builder.merge()

2899

 

        # The hook should set the variable

2900

 

        self.assertEqual(['bar'], self.merger.affected_files)

2901

 

        self.assertEqual(1, len(conflicts))

2902

 

 

2903

 

    def test_hook_called_for_text_conflicts(self):

2904

 

        builder = self.make_text_conflict()

2905

 

        conflicts = builder.merge()

2906

 

        # The hook should call the merge_text() method

2907

 

        self.assertEqual(['merge_text'], self.calls)

2908

 

 

2909

 

    def test_hook_not_called_for_kind_change(self):

2910

 

        builder = self.make_kind_change()

2911

 

        conflicts = builder.merge()

2912

 

        # The hook should not call the merge_text() method

2913

 

        self.assertEqual([], self.calls)

2914

 

 

2915

 

    def test_hook_not_called_for_other_files(self):

2916

 

        builder = self.make_text_conflict('foobar')

2917

 

        conflicts = builder.merge()

2918

 

        # The hook should not call the merge_text() method

2919

 

        self.assertEqual([], self.calls)

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0