/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_merge.py

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

Show diffs side-by-side

added

removed

bzrlib/tests/blackbox/test_merge.py

19

19

"""Black-box tests for bzr merge.

20

20

"""

21

21

 

 

22

import doctest

22

23

import os

23

24

 

 

25

from testtools import matchers

 

26

 

24

27

from bzrlib import (

25

28

    branch,

 

29

    branchbuilder,

26

30

    bzrdir,

27

31

    conflicts,

28

 

    errors,

29

32

    merge_directive,

30

33

    osutils,

31

34

    tests,

102

105

        # Merging a branch pulls its revision into the tree

103

106

        b = branch.Branch.open('../b')

104

107

        b_tip = b.last_revision()

105

 

        self.failUnless(a.branch.repository.has_revision(b_tip))

 

108

        self.assertTrue(a.branch.repository.has_revision(b_tip))

106

109

        self.assertEqual([a_tip, b_tip], a.get_parent_ids())

107

110

        a_tree.revert(backups=False)

108

111

        out, err = self.run_bzr('merge -r revno:1:./hello', retcode=3)

204

207

        b_tree.commit(message='Modified a.txt')

205

208

        os.chdir('b')

206

209

        self.run_bzr('merge ../a/', retcode=1)

207

 

        self.failUnlessExists('sub/a.txt.THIS')

208

 

        self.failUnlessExists('sub/a.txt.BASE')

 

210

        self.assertPathExists('sub/a.txt.THIS')

 

211

        self.assertPathExists('sub/a.txt.BASE')

209

212

        os.chdir('../a')

210

213

        self.run_bzr('merge ../b/', retcode=1)

211

 

        self.failUnlessExists('sub/a.txt.OTHER')

212

 

        self.failUnlessExists('sub/a.txt.BASE')

 

214

        self.assertPathExists('sub/a.txt.OTHER')

 

215

        self.assertPathExists('sub/a.txt.BASE')

213

216

 

214

217

    def test_conflict_leaves_base_this_other_files(self):

215

218

        tree, other = self.create_conflicting_branches()

326

329

        tree_a.add(['file_1', 'file_2'])

327

330

        tree_a.commit('commit 1')

328

331

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

329

 

        self.failUnlessExists('b/file_1')

 

332

        self.assertPathExists('b/file_1')

330

333

        tree_a.rename_one('file_1', 'file_i')

331

334

        tree_a.commit('commit 2')

332

335

        tree_a.rename_one('file_2', 'file_ii')

333

336

        ## os.chdir('b')

334

337

        self.run_bzr('merge a --uncommitted -d b')

335

 

        self.failUnlessExists('b/file_1')

336

 

        self.failUnlessExists('b/file_ii')

 

338

        self.assertPathExists('b/file_1')

 

339

        self.assertPathExists('b/file_ii')

337

340

        tree_b.revert()

338

341

        self.run_bzr_error(('Cannot use --uncommitted and --revision',),

339

342

                           'merge /a --uncommitted -r1 -d b')

347

350

        tree_a.add(['file1', 'file2'])

348

351

        os.chdir('tree_b')

349

352

        self.run_bzr(['merge', '--uncommitted', '../tree_a/file1'])

350

 

        self.failUnlessExists('file1')

351

 

        self.failIfExists('file2')

 

353

        self.assertPathExists('file1')

 

354

        self.assertPathDoesNotExist('file2')

352

355

 

353

356

    def pullable_branch(self):

354

357

        tree_a = self.make_branch_and_tree('a')

355

 

        self.build_tree(['a/file'])

 

358

        self.build_tree_contents([('a/file', 'bar\n')])

356

359

        tree_a.add(['file'])

357

360

        self.id1 = tree_a.commit('commit 1')

358

361

 

359

362

        tree_b = self.make_branch_and_tree('b')

360

363

        tree_b.pull(tree_a.branch)

361

 

        file('b/file', 'wb').write('foo')

 

364

        self.build_tree_contents([('b/file', 'foo\n')])

362

365

        self.id2 = tree_b.commit('commit 2')

363

366

 

364

367

    def test_merge_pull(self):

369

372

        tree_a = workingtree.WorkingTree.open('.')

370

373

        self.assertEqual([self.id2], tree_a.get_parent_ids())

371

374

 

 

375

    def test_merge_pull_preview(self):

 

376

        self.pullable_branch()

 

377

        (out, err) = self.run_bzr('merge --pull --preview -d a b')

 

378

        self.assertThat(out, matchers.DocTestMatches(

 

379

"""=== modified file 'file'

 

380

--- file\t...

 

381

+++ file\t...

 

382

@@ -1,1 +1,1 @@

 

383

-bar

 

384

+foo

 

385

 

 

386

""", doctest.ELLIPSIS | doctest.REPORT_UDIFF))

 

387

        tree_a = workingtree.WorkingTree.open('a')

 

388

        self.assertEqual([self.id1], tree_a.get_parent_ids())

 

389

 

372

390

    def test_merge_kind_change(self):

373

391

        tree_a = self.make_branch_and_tree('tree_a')

374

392

        self.build_tree_contents([('tree_a/file', 'content_1')])

408

426

        self.write_directive('directive', source.branch, 'target', 'rev2',

409

427

                             'rev1')

410

428

        out, err = self.run_bzr('merge -d target directive')

411

 

        self.failIfExists('target/a')

412

 

        self.failUnlessExists('target/b')

 

429

        self.assertPathDoesNotExist('target/a')

 

430

        self.assertPathExists('target/b')

413

431

        self.assertContainsRe(err, 'Performing cherrypick')

414

432

 

415

433

    def write_directive(self, filename, source, target, revision_id,

450

468

        branch_b.add('file2')

451

469

        branch_b.commit('added file2', rev_id='rev2b')

452

470

        branch_b.merge_from_branch(branch_a.branch)

453

 

        self.failUnlessExists('branch_b/file1')

 

471

        self.assertPathExists('branch_b/file1')

454

472

        branch_b.commit('merged branch_a', rev_id='rev3b')

455

473

 

456

474

        # It works if the revid has an interger revno

457

475

        self.run_bzr('merge -d target -r revid:rev2a branch_a')

458

 

        self.failUnlessExists('target/file1')

459

 

        self.failIfExists('target/file2')

 

476

        self.assertPathExists('target/file1')

 

477

        self.assertPathDoesNotExist('target/file2')

460

478

        target.revert()

461

479

 

462

480

        # It should work if the revid has no integer revno

463

481

        self.run_bzr('merge -d target -r revid:rev2a branch_b')

464

 

        self.failUnlessExists('target/file1')

465

 

        self.failIfExists('target/file2')

 

482

        self.assertPathExists('target/file1')

 

483

        self.assertPathDoesNotExist('target/file2')

466

484

 

467

485

    def assertDirectoryContent(self, directory, entries, message=''):

468

486

        """Assert whether entries (file or directories) exist in a directory.

603

621

        other.add('other_file')

604

622

        other.commit('rev1b')

605

623

        self.run_bzr('merge -d this other -r0..')

606

 

        self.failUnlessExists('this/other_file')

 

624

        self.assertPathExists('this/other_file')

607

625

 

608

626

    def test_merge_interactive_unlocks_branch(self):

609

627

        this = self.make_branch_and_tree('this')

621

639

            tree.commit("added "+f)

622

640

        for context in (".", "", "a"):

623

641

            self.run_bzr("merge -r 1..0 " + context)

624

 

            self.failIfExists("a")

 

642

            self.assertPathDoesNotExist("a")

625

643

            tree.revert()

626

 

            self.failUnlessExists("a")

 

644

            self.assertPathExists("a")

627

645

 

628

646

 

629

647

class TestMergeForce(tests.TestCaseWithTransport):

• Older »

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