~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

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

• reverse the comparison (4988.10.5 to 6351.2.2)
• stop comparing with revision 6351.2.2

Show diffs side-by-side

added

removed

bzrlib/tests/blackbox/test_status.py

1

 

# Copyright (C) 2005-2010 Canonical Ltd

 

1

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

    conflicts,

34

34

    errors,

35

35

    osutils,

36

 

    status,

37

36

    )

38

37

import bzrlib.branch

39

38

from bzrlib.osutils import pathjoin

45

44

 

46

45

class BranchStatus(TestCaseWithTransport):

47

46

 

48

 

    def setUp(self):

49

 

        super(BranchStatus, self).setUp()

50

 

        # As TestCase.setUp clears all hooks, we install this default

51

 

        # post_status hook handler for the test.

52

 

        status.hooks.install_named_hook('post_status',

53

 

            status._show_shelve_summary,

54

 

            'bzr status')

55

 

 

56

 

    def assertStatus(self, expected_lines, working_tree, specific_files=None,

 

47

    def assertStatus(self, expected_lines, working_tree,

57

48

        revision=None, short=False, pending=True, verbose=False):

58

49

        """Run status in working_tree and look for output.

59

50

 

60

51

        :param expected_lines: The lines to look for.

61

52

        :param working_tree: The tree to run status in.

62

53

        """

63

 

        output_string = self.status_string(working_tree, specific_files, revision, short,

 

54

        output_string = self.status_string(working_tree, revision, short,

64

55

                pending, verbose)

65

56

        self.assertEqual(expected_lines, output_string.splitlines(True))

66

57

 

67

 

    def status_string(self, wt, specific_files=None, revision=None,

68

 

        short=False, pending=True, verbose=False):

 

58

    def status_string(self, wt, revision=None, short=False, pending=True,

 

59

        verbose=False):

69

60

        # use a real file rather than StringIO because it doesn't handle

70

61

        # Unicode very well.

71

62

        tof = codecs.getwriter('utf-8')(TemporaryFile())

72

 

        show_tree_status(wt, specific_files=specific_files, to_file=tof,

73

 

                revision=revision, short=short, show_pending=pending,

74

 

                verbose=verbose)

 

63

        show_tree_status(wt, to_file=tof, revision=revision, short=short,

 

64

                show_pending=pending, verbose=verbose)

75

65

        tof.seek(0)

76

66

        return tof.read().decode('utf-8')

77

67

 

212

202

        wt = self.make_branch_and_tree('.')

213

203

        b = wt.branch

214

204

 

215

 

        self.build_tree(['directory/','directory/hello.c',

216

 

                         'bye.c','test.c','dir2/',

217

 

                         'missing.c'])

 

205

        self.build_tree(['directory/','directory/hello.c', 'bye.c','test.c','dir2/'])

218

206

        wt.add('directory')

219

207

        wt.add('test.c')

220

208

        wt.commit('testing')

221

 

        wt.add('missing.c')

222

 

        unlink('missing.c')

223

209

 

224

210

        self.assertStatus([

225

 

                'missing:\n',

226

 

                '  missing.c\n',

227

211

                'unknown:\n',

228

212

                '  bye.c\n',

229

213

                '  dir2/\n',

234

218

        self.assertStatus([

235

219

                '?   bye.c\n',

236

220

                '?   dir2/\n',

237

 

                '+!  missing.c\n',

238

221

                '?   directory/hello.c\n'

239

222

                ],

240

223

                wt, short=True)

277

260

        tof.seek(0)

278

261

        self.assertEquals(tof.readlines(), ['+N  test.c\n'])

279

262

 

280

 

        tof = StringIO()

281

 

        show_tree_status(wt, specific_files=['missing.c'], to_file=tof)

282

 

        tof.seek(0)

283

 

        self.assertEquals(tof.readlines(),

284

 

                          ['missing:\n',

285

 

                           '  missing.c\n'])

286

 

 

287

 

        tof = StringIO()

288

 

        show_tree_status(wt, specific_files=['missing.c'], to_file=tof,

289

 

                         short=True)

290

 

        tof.seek(0)

291

 

        self.assertEquals(tof.readlines(),

292

 

                          ['+!  missing.c\n'])

293

 

 

294

263

    def test_specific_files_conflicts(self):

295

264

        tree = self.make_branch_and_tree('.')

296

265

        self.build_tree(['dir2/'])

325

294

        wt.add('FILE_D')

326

295

        wt.add('FILE_E')

327

296

        wt.commit('Create five empty files.')

328

 

        with open('FILE_B', 'w') as f: f.write('Modification to file FILE_B.')

329

 

        with open('FILE_C', 'w') as f: f.write('Modification to file FILE_C.')

 

297

        open('FILE_B', 'w').write('Modification to file FILE_B.')

 

298

        open('FILE_C', 'w').write('Modification to file FILE_C.')

330

299

        unlink('FILE_E')  # FILE_E will be versioned but missing

331

 

        with open('FILE_Q', 'w') as f: f.write('FILE_Q is added but not committed.')

 

300

        open('FILE_Q', 'w').write('FILE_Q is added but not committed.')

332

301

        wt.add('FILE_Q')  # FILE_Q will be added but not committed

333

302

        open('UNVERSIONED_BUT_EXISTING', 'w')

334

303

        return wt

478

447

          ' M  FILE_B\n',

479

448

          'X   NONEXISTENT\n',

480

449

          ]

481

 

        expected.sort()

482

450

        out, err = self.run_bzr('status --short NONEXISTENT '

483

451

                                'FILE_A FILE_B UNVERSIONED_BUT_EXISTING '

484

452

                                'FILE_C FILE_D FILE_E FILE_Q', retcode=3)

485

 

        actual = out.splitlines(True)

486

 

        actual.sort()

487

 

        self.assertEqual(expected, actual)

 

453

        self.assertEqual(expected, out.splitlines(True))

488

454

        self.assertContainsRe(err,

489

455

                              r'.*ERROR: Path\(s\) do not exist: '

490

456

                              'NONEXISTENT.*')

506

472

        self.assertEqual("working tree is out of date, run 'bzr update'\n",

507

473

                         err)

508

474

 

509

 

    def test_status_on_ignored(self):

510

 

        """Tests branch status on an unversioned file which is considered ignored.

511

 

 

512

 

        See https://bugs.launchpad.net/bzr/+bug/40103

513

 

        """

514

 

        tree = self.make_branch_and_tree('.')

515

 

 

516

 

        self.build_tree(['test1.c', 'test1.c~', 'test2.c~'])

517

 

        result = self.run_bzr('status')[0]

518

 

        self.assertContainsRe(result, "unknown:\n  test1.c\n")

519

 

        short_result = self.run_bzr('status --short')[0]

520

 

        self.assertContainsRe(short_result, "\?   test1.c\n")

521

 

 

522

 

        result = self.run_bzr('status test1.c')[0]

523

 

        self.assertContainsRe(result, "unknown:\n  test1.c\n")

524

 

        short_result = self.run_bzr('status --short test1.c')[0]

525

 

        self.assertContainsRe(short_result, "\?   test1.c\n")

526

 

 

527

 

        result = self.run_bzr('status test1.c~')[0]

528

 

        self.assertContainsRe(result, "ignored:\n  test1.c~\n")

529

 

        short_result = self.run_bzr('status --short test1.c~')[0]

530

 

        self.assertContainsRe(short_result, "I   test1.c~\n")

531

 

 

532

 

        result = self.run_bzr('status test1.c~ test2.c~')[0]

533

 

        self.assertContainsRe(result, "ignored:\n  test1.c~\n  test2.c~\n")

534

 

        short_result = self.run_bzr('status --short test1.c~ test2.c~')[0]

535

 

        self.assertContainsRe(short_result, "I   test1.c~\nI   test2.c~\n")

536

 

 

537

 

        result = self.run_bzr('status test1.c test1.c~ test2.c~')[0]

538

 

        self.assertContainsRe(result, "unknown:\n  test1.c\nignored:\n  test1.c~\n  test2.c~\n")

539

 

        short_result = self.run_bzr('status --short test1.c test1.c~ test2.c~')[0]

540

 

        self.assertContainsRe(short_result, "\?   test1.c\nI   test1.c~\nI   test2.c~\n")

541

 

 

542

475

    def test_status_write_lock(self):

543

476

        """Test that status works without fetching history and

544

477

        having a write lock.

554

487

        out, err = self.run_bzr('status branch1 -rbranch:branch2')

555

488

        self.assertEqual('', out)

556

489

 

557

 

    def test_status_with_shelves(self):

558

 

        """Ensure that _show_shelve_summary handler works.

559

 

        """

560

 

        wt = self.make_branch_and_tree('.')

561

 

        self.build_tree(['hello.c'])

562

 

        wt.add('hello.c')

563

 

        self.run_bzr(['shelve', '--all', '-m', 'foo'])

564

 

        self.build_tree(['bye.c'])

565

 

        wt.add('bye.c')

566

 

        self.assertStatus([

567

 

                'added:\n',

568

 

                '  bye.c\n',

569

 

                '1 shelf exists. See "bzr shelve --list" for details.\n',

570

 

            ],

571

 

            wt)

572

 

        self.run_bzr(['shelve', '--all', '-m', 'bar'])

573

 

        self.build_tree(['eggs.c', 'spam.c'])

574

 

        wt.add('eggs.c')

575

 

        wt.add('spam.c')

576

 

        self.assertStatus([

577

 

                'added:\n',

578

 

                '  eggs.c\n',

579

 

                '  spam.c\n',

580

 

                '2 shelves exist. See "bzr shelve --list" for details.\n',

581

 

            ],

582

 

            wt)

583

 

        self.assertStatus([

584

 

                'added:\n',

585

 

                '  spam.c\n',

586

 

            ],

587

 

            wt,

588

 

            specific_files=['spam.c'])

589

 

 

590

490

 

591

491

class CheckoutStatus(BranchStatus):

592

492

 

598

498

    def make_branch_and_tree(self, relpath):

599

499

        source = self.make_branch(pathjoin('..', relpath))

600

500

        checkout = bzrdir.BzrDirMetaFormat1().initialize(relpath)

601

 

        bzrlib.branch.BranchReferenceFormat().initialize(checkout,

602

 

            target_branch=source)

 

501

        bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)

603

502

        return checkout.create_workingtree()

604

503

 

605

504

 

646

545

        self.assertContainsRe(result, "[+]N  hello.txt\n")

647

546

 

648

547

        self.build_tree(['world.txt'])

649

 

        result = self.run_bzr("status -S -r 0")[0]

 

548

        result = self.run_bzr("status --short -r 0")[0]

650

549

        self.assertContainsRe(result, "[+]N  hello.txt\n" \

651

550

                                      "[?]   world.txt\n")

652

 

        result2 = self.run_bzr("status -S -r 0..")[0]

 

551

        result2 = self.run_bzr("status --short -r 0..")[0]

653

552

        self.assertEquals(result2, result)

654

553

 

655

554

    def test_status_versioned(self):

696

595

        result2 = self.run_bzr("status -SV -r 0..")[0]

697

596

        self.assertEquals(result2, result)

698

597

 

699

 

    def assertStatusContains(self, pattern, short=False):

 

598

    def assertStatusContains(self, pattern):

700

599

        """Run status, and assert it contains the given pattern"""

701

 

        if short:

702

 

            result = self.run_bzr("status --short")[0]

703

 

        else:

704

 

            result = self.run_bzr("status")[0]

 

600

        result = self.run_bzr("status --short")[0]

705

601

        self.assertContainsRe(result, pattern)

706

602

 

707

 

    def test_kind_change_plain(self):

708

 

        tree = self.make_branch_and_tree('.')

709

 

        self.build_tree(['file'])

710

 

        tree.add('file')

711

 

        tree.commit('added file')

712

 

        unlink('file')

713

 

        self.build_tree(['file/'])

714

 

        self.assertStatusContains('kind changed:\n  file \(file => directory\)')

715

 

        tree.rename_one('file', 'directory')

716

 

        self.assertStatusContains('renamed:\n  file/ => directory/\n' \

717

 

                                  'modified:\n  directory/\n')

718

 

        rmdir('directory')

719

 

        self.assertStatusContains('removed:\n  file\n')

720

 

 

721

603

    def test_kind_change_short(self):

722

604

        tree = self.make_branch_and_tree('.')

723

605

        self.build_tree(['file'])

725

607

        tree.commit('added file')

726

608

        unlink('file')

727

609

        self.build_tree(['file/'])

728

 

        self.assertStatusContains('K  file => file/',

729

 

                                   short=True)

 

610

        self.assertStatusContains('K  file => file/')

730

611

        tree.rename_one('file', 'directory')

731

 

        self.assertStatusContains('RK  file => directory/',

732

 

                                   short=True)

 

612

        self.assertStatusContains('RK  file => directory/')

733

613

        rmdir('directory')

734

 

        self.assertStatusContains('RD  file => directory',

735

 

                                   short=True)

 

614

        self.assertStatusContains('RD  file => directory')

736

615

 

737

616

    def test_status_illegal_revision_specifiers(self):

738

617

        out, err = self.run_bzr('status -r 1..23..123', retcode=3)

771

650

 

772

651

class TestStatusEncodings(TestCaseWithTransport):

773

652

 

 

653

    def setUp(self):

 

654

        TestCaseWithTransport.setUp(self)

 

655

        self.user_encoding = osutils._cached_user_encoding

 

656

        self.stdout = sys.stdout

 

657

 

 

658

    def tearDown(self):

 

659

        osutils._cached_user_encoding = self.user_encoding

 

660

        sys.stdout = self.stdout

 

661

        TestCaseWithTransport.tearDown(self)

 

662

 

774

663

    def make_uncommitted_tree(self):

775

664

        """Build a branch with uncommitted unicode named changes in the cwd."""

776

665

        working_tree = self.make_branch_and_tree(u'.')

784

673

        return working_tree

785

674

 

786

675

    def test_stdout_ascii(self):

787

 

        self.overrideAttr(osutils, '_cached_user_encoding', 'ascii')

 

676

        sys.stdout = StringIO()

 

677

        osutils._cached_user_encoding = 'ascii'

788

678

        working_tree = self.make_uncommitted_tree()

789

679

        stdout, stderr = self.run_bzr("status")

790

680

 

794

684

""")

795

685

 

796

686

    def test_stdout_latin1(self):

797

 

        self.overrideAttr(osutils, '_cached_user_encoding', 'latin-1')

 

687

        sys.stdout = StringIO()

 

688

        osutils._cached_user_encoding = 'latin-1'

798

689

        working_tree = self.make_uncommitted_tree()

799

690

        stdout, stderr = self.run_bzr('status')

800

691

 

• Older »

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