~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

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

• reverse the comparison (4988.6.2 to 5039)
• stop comparing with revision 5039

Show diffs side-by-side

added

removed

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()

2834

2841

 

2835

2842

class TestConfigurableFileMerger(tests.TestCaseWithTransport):

2836

2843

 

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):

 

2844

    def test_affected_files_cached(self):

 

2845

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

 

2846

        class SimplePlan(_mod_merge.ConfigurableFileMerger):

2846

2847

            name_prefix = "foo"

2847

 

            default_files = ['bar']

2848

 

 

 

2848

            default_files = ["my default"]

2849

2849

            def merge_text(self, params):

2850

 

                test.calls.append('merge_text')

2851

 

                return ('not_applicable', None)

2852

 

 

 

2850

                return ('not applicable', None)

2853

2851

        def factory(merger):

2854

 

            result = FooMerger(merger)

2855

 

            # Make sure we start with a clean slate

 

2852

            result = SimplePlan(merger)

2856

2853

            self.assertEqual(None, result.affected_files)

2857

 

            # Track the original merger

2858

2854

            self.merger = result

2859

2855

            return result

2860

 

 

2861

 

        return factory

2862

 

 

2863

 

    def _install_hook(self, factory):

2864

2856

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

2865

 

                                                   factory, 'test factory')

2866

 

 

2867

 

    def make_builder(self):

 

2857

            factory, 'test factory')

2868

2858

        builder = test_merge_core.MergeBuilder(self.test_base_dir)

2869

2859

        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_affected_files_cached(self):

2891

 

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

2892

 

        builder = self.make_text_conflict()

 

2860

        builder.add_file('NEWS', builder.tree_root, 'name1', 'text1', True)

 

2861

        builder.change_contents('NEWS', other='text4', this='text3')

2893

2862

        conflicts = builder.merge()

2894

2863

        # The hook should set the variable

2895

 

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

2896

 

        self.assertEqual(1, len(conflicts))

2897

 

 

2898

 

    def test_hook_called_for_text_conflicts(self):

2899

 

        builder = self.make_text_conflict()

2900

 

        conflicts = builder.merge()

2901

 

        # The hook should call the merge_text() method

2902

 

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

2903

 

 

2904

 

    def test_hook_not_called_for_kind_change(self):

2905

 

        builder = self.make_kind_change()

2906

 

        conflicts = builder.merge()

2907

 

        # The hook should not call the merge_text() method

2908

 

        self.assertEqual([], self.calls)

2909

 

 

2910

 

    def test_hook_not_called_for_other_files(self):

2911

 

        builder = self.make_text_conflict('foobar')

2912

 

        conflicts = builder.merge()

2913

 

        # The hook should not call the merge_text() method

2914

 

        self.assertEqual([], self.calls)

 

2864

        self.assertEqual(["my default"], self.merger.affected_files)

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1