~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

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

• reverse the comparison (5220 to 6141)
• stop comparing with revision 6141

Show diffs side-by-side

added

removed

bzrlib/tests/blackbox/test_branch.py

1

 

# Copyright (C) 2006-2011 Canonical Ltd

 

1

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

23

23

    branch,

24

24

    bzrdir,

25

25

    errors,

 

26

    repository,

26

27

    revision as _mod_revision,

27

28

    )

28

29

from bzrlib.repofmt.knitrepo import RepositoryFormatKnit1

29

 

from bzrlib.tests import TestCaseWithTransport

 

30

from bzrlib.tests.blackbox import ExternalBase

30

31

from bzrlib.tests import (

31

 

    fixtures,

32

 

    script,

 

32

    KnownFailure,

 

33

    HardlinkFeature,

33

34

    test_server,

34

35

    )

35

 

from bzrlib.tests.features import (

36

 

    HardlinkFeature,

37

 

    )

38

 

from bzrlib.tests.blackbox import test_switch

39

36

from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer

40

 

from bzrlib.tests.script import run_script

41

37

from bzrlib.urlutils import local_path_to_url, strip_trailing_slash

42

38

from bzrlib.workingtree import WorkingTree

43

39

 

44

40

 

45

 

class TestBranch(TestCaseWithTransport):

 

41

class TestBranch(ExternalBase):

46

42

 

47

43

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

48

44

        tree = self.make_branch_and_tree(path)

63

59

        self.assertFalse(b._transport.has('branch-name'))

64

60

        b.bzrdir.open_workingtree().commit(message='foo', allow_pointless=True)

65

61

 

66

 

    def test_branch_broken_pack(self):

67

 

        """branching with a corrupted pack file."""

68

 

        self.example_branch('a')

69

 

        #now add some random corruption

70

 

        fname = 'a/.bzr/repository/packs/' + os.listdir('a/.bzr/repository/packs')[0]

71

 

        with open(fname, 'rb+') as f:

72

 

            f.seek(750)

73

 

            f.write("\xff")

74

 

        self.run_bzr_error(['Corruption while decompressing repository file'], 

75

 

                            'branch a b', retcode=3)

76

 

 

77

62

    def test_branch_switch_no_branch(self):

78

63

        # No branch in the current directory:

79

64

        #  => new branch will be created, but switch fails

189

174

        target_stat = os.stat('target/file1')

190

175

        self.assertEqual(source_stat, target_stat)

191

176

 

192

 

    def test_branch_files_from(self):

193

 

        source = self.make_branch_and_tree('source')

194

 

        self.build_tree(['source/file1'])

195

 

        source.add('file1')

196

 

        source.commit('added file')

197

 

        out, err = self.run_bzr('branch source target --files-from source')

198

 

        self.assertPathExists('target/file1')

199

 

 

200

 

    def test_branch_files_from_hardlink(self):

201

 

        self.requireFeature(HardlinkFeature)

202

 

        source = self.make_branch_and_tree('source')

203

 

        self.build_tree(['source/file1'])

204

 

        source.add('file1')

205

 

        source.commit('added file')

206

 

        source.bzrdir.sprout('second')

207

 

        out, err = self.run_bzr('branch source target --files-from second'

208

 

                                ' --hardlink')

209

 

        source_stat = os.stat('source/file1')

210

 

        second_stat = os.stat('second/file1')

211

 

        target_stat = os.stat('target/file1')

212

 

        self.assertNotEqual(source_stat, target_stat)

213

 

        self.assertEqual(second_stat, target_stat)

214

 

 

215

177

    def test_branch_standalone(self):

216

178

        shared_repo = self.make_repository('repo', shared=True)

217

179

        self.example_branch('source')

224

186

    def test_branch_no_tree(self):

225

187

        self.example_branch('source')

226

188

        self.run_bzr('branch --no-tree source target')

227

 

        self.assertPathDoesNotExist('target/hello')

228

 

        self.assertPathDoesNotExist('target/goodbye')

 

189

        self.failIfExists('target/hello')

 

190

        self.failIfExists('target/goodbye')

229

191

 

230

192

    def test_branch_into_existing_dir(self):

231

193

        self.example_branch('a')

241

203

        # force operation

242

204

        self.run_bzr('branch a b --use-existing-dir')

243

205

        # check conflicts

244

 

        self.assertPathExists('b/hello.moved')

245

 

        self.assertPathDoesNotExist('b/godbye.moved')

 

206

        self.failUnlessExists('b/hello.moved')

 

207

        self.failIfExists('b/godbye.moved')

246

208

        # we can't branch into branch

247

209

        out,err = self.run_bzr('branch a b --use-existing-dir', retcode=3)

248

210

        self.assertEqual('', out)

285

247

        self.run_bzr('checkout --lightweight a b')

286

248

        self.assertLength(2, calls)

287

249

 

288

 

    def test_branch_fetches_all_tags(self):

289

 

        builder = self.make_branch_builder('source')

290

 

        source = fixtures.build_branch_with_non_ancestral_rev(builder)

291

 

        source.tags.set_tag('tag-a', 'rev-2')

292

 

        source.get_config().set_user_option('branch.fetch_tags', 'True')

293

 

        # Now source has a tag not in its ancestry.  Make a branch from it.

294

 

        self.run_bzr('branch source new-branch')

295

 

        new_branch = branch.Branch.open('new-branch')

296

 

        # The tag is present, and so is its revision.

297

 

        self.assertEqual('rev-2', new_branch.tags.lookup_tag('tag-a'))

298

 

        new_branch.repository.get_revision('rev-2')

299

 

 

300

 

 

301

 

class TestBranchStacked(TestCaseWithTransport):

 

250

 

 

251

class TestBranchStacked(ExternalBase):

302

252

    """Tests for branch --stacked"""

303

253

 

304

254

    def assertRevisionInRepository(self, repo_path, revid):

426

376

            err)

427

377

 

428

378

 

429

 

class TestSmartServerBranching(TestCaseWithTransport):

 

379

class TestSmartServerBranching(ExternalBase):

430

380

 

431

381

    def test_branch_from_trivial_branch_to_same_server_branch_acceptance(self):

432

382

        self.setup_smart_server_with_call_log()

441

391

        # being too low. If rpc_count increases, more network roundtrips have

442

392

        # become necessary for this use case. Please do not adjust this number

443

393

        # upwards without agreement from bzr's network support maintainers.

444

 

        self.assertLength(37, self.hpss_calls)

 

394

        self.assertLength(38, self.hpss_calls)

445

395

 

446

396

    def test_branch_from_trivial_branch_streaming_acceptance(self):

447

397

        self.setup_smart_server_with_call_log()

478

428

        # upwards without agreement from bzr's network support maintainers.

479

429

        self.assertLength(15, self.hpss_calls)

480

430

 

481

 

    def test_branch_from_branch_with_tags(self):

482

 

        self.setup_smart_server_with_call_log()

483

 

        builder = self.make_branch_builder('source')

484

 

        source = fixtures.build_branch_with_non_ancestral_rev(builder)

485

 

        source.get_config().set_user_option('branch.fetch_tags', 'True')

486

 

        source.tags.set_tag('tag-a', 'rev-2')

487

 

        source.tags.set_tag('tag-missing', 'missing-rev')

488

 

        # Now source has a tag not in its ancestry.  Make a branch from it.

489

 

        self.reset_smart_call_log()

490

 

        out, err = self.run_bzr(['branch', self.get_url('source'), 'target'])

491

 

        # This figure represent the amount of work to perform this use case. It

492

 

        # is entirely ok to reduce this number if a test fails due to rpc_count

493

 

        # being too low. If rpc_count increases, more network roundtrips have

494

 

        # become necessary for this use case. Please do not adjust this number

495

 

        # upwards without agreement from bzr's network support maintainers.

496

 

        self.assertLength(10, self.hpss_calls)

497

 

 

498

 

    def test_branch_to_stacked_from_trivial_branch_streaming_acceptance(self):

499

 

        self.setup_smart_server_with_call_log()

500

 

        t = self.make_branch_and_tree('from')

501

 

        for count in range(9):

502

 

            t.commit(message='commit %d' % count)

503

 

        self.reset_smart_call_log()

504

 

        out, err = self.run_bzr(['branch', '--stacked', self.get_url('from'),

505

 

            'local-target'])

506

 

        # XXX: the number of hpss calls for this case isn't deterministic yet,

507

 

        # so we can't easily assert about the number of calls.

508

 

        #self.assertLength(XXX, self.hpss_calls)

509

 

        # We can assert that none of the calls were readv requests for rix

510

 

        # files, though (demonstrating that at least get_parent_map calls are

511

 

        # not using VFS RPCs).

512

 

        readvs_of_rix_files = [

513

 

            c for c in self.hpss_calls

514

 

            if c.call.method == 'readv' and c.call.args[-1].endswith('.rix')]

515

 

        self.assertLength(0, readvs_of_rix_files)

516

 

 

517

431

 

518

432

class TestRemoteBranch(TestCaseWithSFTPServer):

519

433

 

538

452

        # Ensure that no working tree what created remotely

539

453

        self.assertFalse(t.has('remote/file'))

540

454

 

541

 

 

542

 

class TestDeprecatedAliases(TestCaseWithTransport):

543

 

 

544

 

    def test_deprecated_aliases(self):

545

 

        """bzr branch can be called clone or get, but those names are deprecated.

546

 

 

547

 

        See bug 506265.

548

 

        """

549

 

        for command in ['clone', 'get']:

550

 

            run_script(self, """

551

 

            $ bzr %(command)s A B

552

 

            2>The command 'bzr %(command)s' has been deprecated in bzr 2.4. Please use 'bzr branch' instead.

553

 

            2>bzr: ERROR: Not a branch...

554

 

            """ % locals())

555

 

 

556

 

 

557

 

class TestBranchParentLocation(test_switch.TestSwitchParentLocationBase):

558

 

 

559

 

    def _checkout_and_branch(self, option=''):

560

 

        self.script_runner.run_script(self, '''

561

 

                $ bzr checkout %(option)s repo/trunk checkout

562

 

                $ cd checkout

563

 

                $ bzr branch --switch ../repo/trunk ../repo/branched

564

 

                2>Branched 0 revision(s).

565

 

                2>Tree is up to date at revision 0.

566

 

                2>Switched to branch:...branched...

567

 

                $ cd ..

568

 

                ''' % locals())

569

 

        bound_branch = branch.Branch.open_containing('checkout')[0]

570

 

        master_branch = branch.Branch.open_containing('repo/branched')[0]

571

 

        return (bound_branch, master_branch)

572

 

 

573

 

    def test_branch_switch_parent_lightweight(self):

574

 

        """Lightweight checkout using bzr branch --switch."""

575

 

        bb, mb = self._checkout_and_branch(option='--lightweight')

576

 

        self.assertParent('repo/trunk', bb)

577

 

        self.assertParent('repo/trunk', mb)

578

 

 

579

 

    def test_branch_switch_parent_heavyweight(self):

580

 

        """Heavyweight checkout using bzr branch --switch."""

581

 

        bb, mb = self._checkout_and_branch()

582

 

        self.assertParent('repo/trunk', bb)

583

 

        self.assertParent('repo/trunk', mb)

• Older »

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