~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

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

• reverse the comparison (5609.53.1 to 4577.2.1)
• stop comparing with revision 4577.2.1

Show diffs side-by-side

added

removed

bzrlib/tests/blackbox/test_pull.py

1

 

# Copyright (C) 2005, 2006 Canonical Ltd

 

1

# Copyright (C) 2005-2010 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

20

20

import os

21

21

import sys

22

22

 

 

23

from bzrlib import (

 

24

    debug,

 

25

    remote,

 

26

    urlutils,

 

27

    )

 

28

 

23

29

from bzrlib.branch import Branch

24

30

from bzrlib.directory_service import directories

25

31

from bzrlib.osutils import pathjoin

26

 

from bzrlib.tests.blackbox import ExternalBase

 

32

from bzrlib.tests import TestCaseWithTransport

27

33

from bzrlib.uncommit import uncommit

28

34

from bzrlib.workingtree import WorkingTree

29

 

from bzrlib import urlutils

30

 

 

31

 

 

32

 

class TestPull(ExternalBase):

 

35

 

 

36

 

 

37

class TestPull(TestCaseWithTransport):

33

38

 

34

39

    def example_branch(self, path='.'):

35

40

        tree = self.make_branch_and_tree(path)

338

343

            def look_up(self, name, url):

339

344

                return 'source'

340

345

        directories.register('foo:', FooService, 'Testing directory service')

341

 

        self.addCleanup(lambda: directories.remove('foo:'))

 

346

        self.addCleanup(directories.remove, 'foo:')

342

347

        self.run_bzr('pull foo:bar -d target')

343

348

        self.assertEqual(source_last, target.last_revision())

344

349

 

390

395

        self.assertLength(18, self.hpss_calls)

391

396

        remote = Branch.open('stacked')

392

397

        self.assertEndsWith(remote.get_stacked_on_url(), '/parent')

 

398

    

 

399

    def test_pull_cross_format_warning(self):

 

400

        """You get a warning for probably slow cross-format pulls.

 

401

        """

 

402

        # this is assumed to be going through InterDifferingSerializer

 

403

        from_tree = self.make_branch_and_tree('from', format='2a')

 

404

        to_tree = self.make_branch_and_tree('to', format='1.14-rich-root')

 

405

        from_tree.commit(message='first commit')

 

406

        out, err = self.run_bzr(['pull', '-d', 'to', 'from'])

 

407

        self.assertContainsRe(err,

 

408

            "(?m)Doing on-the-fly conversion")

 

409

 

 

410

    def test_pull_cross_format_warning_no_IDS(self):

 

411

        """You get a warning for probably slow cross-format pulls.

 

412

        """

 

413

        # this simulates what would happen across the network, where

 

414

        # interdifferingserializer is not active

 

415

 

 

416

        debug.debug_flags.add('IDS_never')

 

417

        # TestCase take care of restoring them

 

418

 

 

419

        from_tree = self.make_branch_and_tree('from', format='2a')

 

420

        to_tree = self.make_branch_and_tree('to', format='1.14-rich-root')

 

421

        from_tree.commit(message='first commit')

 

422

        out, err = self.run_bzr(['pull', '-d', 'to', 'from'])

 

423

        self.assertContainsRe(err,

 

424

            "(?m)Doing on-the-fly conversion")

 

425

 

 

426

    def test_pull_cross_format_from_network(self):

 

427

        self.setup_smart_server_with_call_log()

 

428

        from_tree = self.make_branch_and_tree('from', format='2a')

 

429

        to_tree = self.make_branch_and_tree('to', format='1.14-rich-root')

 

430

        self.assertIsInstance(from_tree.branch, remote.RemoteBranch)

 

431

        from_tree.commit(message='first commit')

 

432

        out, err = self.run_bzr(['pull', '-d', 'to',

 

433

            from_tree.branch.bzrdir.root_transport.base])

 

434

        self.assertContainsRe(err,

 

435

            "(?m)Doing on-the-fly conversion")

 

436

 

 

437

    def test_pull_to_experimental_format_warning(self):

 

438

        """You get a warning for pulling into experimental formats.

 

439

        """

 

440

        from_tree = self.make_branch_and_tree('from', format='development-subtree')

 

441

        to_tree = self.make_branch_and_tree('to', format='development-subtree')

 

442

        from_tree.commit(message='first commit')

 

443

        out, err = self.run_bzr(['pull', '-d', 'to', 'from'])

 

444

        self.assertContainsRe(err,

 

445

            "(?m)Fetching into experimental format")

 

446

 

 

447

    def test_pull_cross_to_experimental_format_warning(self):

 

448

        """You get a warning for pulling into experimental formats.

 

449

        """

 

450

        from_tree = self.make_branch_and_tree('from', format='2a')

 

451

        to_tree = self.make_branch_and_tree('to', format='development-subtree')

 

452

        from_tree.commit(message='first commit')

 

453

        out, err = self.run_bzr(['pull', '-d', 'to', 'from'])

 

454

        self.assertContainsRe(err,

 

455

            "(?m)Fetching into experimental format")

 

456

 

 

457

    def test_pull_show_base(self):

 

458

        """bzr pull supports --show-base

 

459

 

 

460

        see https://bugs.launchpad.net/bzr/+bug/202374"""

 

461

        # create two trees with conflicts, setup conflict, check that

 

462

        # conflicted file looks correct

 

463

        a_tree = self.example_branch('a')

 

464

        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()

 

465

 

 

466

        f = open(pathjoin('a', 'hello'),'wt')

 

467

        f.write('fee')

 

468

        f.close()

 

469

        a_tree.commit('fee')

 

470

 

 

471

        f = open(pathjoin('b', 'hello'),'wt')

 

472

        f.write('fie')

 

473

        f.close()

 

474

 

 

475

        out,err=self.run_bzr(['pull','-d','b','a','--show-base'])

 

476

 

 

477

        # check for message here

 

478

        self.assertEqual(err,

 

479

                         ' M  hello\nText conflict in hello\n1 conflicts encountered.\n')

 

480

 

 

481

        self.assertEqualDiff('<<<<<<< TREE\n'

 

482

                             'fie||||||| BASE-REVISION\n'

 

483

                             'foo=======\n'

 

484

                             'fee>>>>>>> MERGE-SOURCE\n',

 

485

                             open(pathjoin('b', 'hello')).read())

 

486

 

 

487

    def test_pull_show_base_working_tree_only(self):

 

488

        """--show-base only allowed if there's a working tree

 

489

 

 

490

        see https://bugs.launchpad.net/bzr/+bug/202374"""

 

491

        # create a branch, see that --show-base fails

 

492

        self.make_branch('from')

 

493

        self.make_branch('to')

 

494

        out=self.run_bzr(['pull','-d','to','from','--show-base'],retcode=3)

 

495

        self.assertEqual(out,

 

496

                         ('','bzr: ERROR: Need working tree for --show-base.\n'))

 

497

 

393

498

 

• Older »

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