/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to tests/test_commit.py

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

• reverse the comparison (757 to 689)
• stop comparing with revision 689

Show diffs side-by-side

added

removed

tests/test_commit.py

18

18

 

19

19

import os

20

20

 

21

 

import gtk

 

21

from gi.repository import Gtk

22

22

 

23

23

from bzrlib import (

24

24

    branch,

25

 

    revision,

26

25

    tests,

27

26

    uncommit,

28

27

    )

29

28

try:

 

29

    from bzrlib.tests.features import UnicodeFilenameFeature

 

30

except ImportError: # bzr < 2.5

 

31

    from bzrlib.tests import UnicodeFilenameFeature

 

32

try:

30

33

    from bzrlib import bencode

31

34

except ImportError:

32

35

    from bzrlib.util import bencode

33

36

 

34

 

from bzrlib.plugins.gtk import commit

 

37

from bzrlib.plugins.gtk import (

 

38

    commit,

 

39

    commitmsgs,

 

40

    )

35

41

 

36

42

 

37

43

# TODO: All we need is basic ancestry code to test this, we shouldn't need a

212

218

 

213

219

        commit_col = dlg._treeview_files.get_column(0)

214

220

        self.assertEqual('Commit', commit_col.get_title())

215

 

        renderer = commit_col.get_cell_renderers()[0]

 

221

        renderer = commit_col.get_cells()[0]

216

222

        self.assertTrue(renderer.get_property('activatable'))

217

223

 

218

224

        self.assertEqual('Commit all changes',

237

243

 

238

244

        commit_col = dlg._treeview_files.get_column(0)

239

245

        self.assertEqual('Commit*', commit_col.get_title())

240

 

        renderer = commit_col.get_cell_renderers()[0]

 

246

        renderer = commit_col.get_cells()[0]

241

247

        self.assertFalse(renderer.get_property('activatable'))

242

248

 

243

249

        values = [(r[0], r[1], r[2], r[3]) for r in dlg._pending_store]

385

391

                          ('b-id', 'b', True, 'b/', 'removed'),

386

392

                         ], values)

387

393

        # All Files should be selected

388

 

        self.assertEqual(((0,), None), dlg._treeview_files.get_cursor())

 

394

        self.assertEqual(

 

395

            (Gtk.TreePath(path=0), None), dlg._treeview_files.get_cursor())

389

396

 

390

397

    def test_filelist_with_selected(self):

391

398

        tree = self.make_branch_and_tree('tree')

400

407

                         ], values)

401

408

        # This file should also be selected in the file list, rather than the

402

409

        # 'All Files' selection

403

 

        self.assertEqual(((1,), None), dlg._treeview_files.get_cursor())

 

410

        self.assertEqual(

 

411

            (Gtk.TreePath(path=1), None), dlg._treeview_files.get_cursor())

404

412

 

405

413

    def test_diff_view(self):

406

414

        tree = self.make_branch_and_tree('tree')

414

422

        dlg = commit.CommitDialog(tree)

415

423

        diff_buffer = dlg._diff_view.buffer

416

424

        text = diff_buffer.get_text(diff_buffer.get_start_iter(),

417

 

                                    diff_buffer.get_end_iter()).splitlines(True)

 

425

                                    diff_buffer.get_end_iter(),

 

426

                                    True).splitlines(True)

418

427

 

419

428

        self.assertEqual("=== modified file 'a'\n", text[0])

420

429

        self.assertContainsRe(text[1],

465

474

        self.assertFalse(dlg._file_message_expander.get_expanded())

466

475

        self.assertFalse(dlg._file_message_expander.get_property('sensitive'))

467

476

 

468

 

        dlg._treeview_files.set_cursor((1,))

 

477

        dlg._treeview_files.set_cursor(

 

478

            Gtk.TreePath(path=1), None, False)

469

479

        self.assertEqual('Diff for a', dlg._diff_label.get_text())

470

480

        text = diff_buffer.get_text(diff_buffer.get_start_iter(),

471

 

                                    diff_buffer.get_end_iter()).splitlines(True)

 

481

                                    diff_buffer.get_end_iter(),

 

482

                                    True).splitlines(True)

472

483

        self.assertEqual("=== added file 'a'\n", text[0])

473

484

        self.assertContainsRe(text[1],

474

485

            r"--- a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")

482

493

        self.assertTrue(dlg._file_message_expander.get_expanded())

483

494

        self.assertTrue(dlg._file_message_expander.get_property('sensitive'))

484

495

 

485

 

        dlg._treeview_files.set_cursor((2,))

 

496

        dlg._treeview_files.set_cursor(

 

497

            Gtk.TreePath(path=2), None, False)

486

498

        self.assertEqual('Diff for b', dlg._diff_label.get_text())

487

499

        text = diff_buffer.get_text(diff_buffer.get_start_iter(),

488

 

                                    diff_buffer.get_end_iter()).splitlines(True)

 

500

                                    diff_buffer.get_end_iter(),

 

501

                                    True).splitlines(True)

489

502

        self.assertEqual("=== added file 'b'\n", text[0])

490

503

        self.assertContainsRe(text[1],

491

504

            r"--- b\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")

499

512

        self.assertTrue(dlg._file_message_expander.get_expanded())

500

513

        self.assertTrue(dlg._file_message_expander.get_property('sensitive'))

501

514

 

502

 

        dlg._treeview_files.set_cursor((0,))

 

515

        dlg._treeview_files.set_cursor(

 

516

            Gtk.TreePath(path=0), None, False)

503

517

        self.assertEqual('Diff for All Files', dlg._diff_label.get_text())

504

518

        self.assertEqual('File commit message',

505

519

                         dlg._file_message_expander.get_label())

515

529

 

516

530

        def get_file_text():

517

531

            buf = dlg._file_message_text_view.get_buffer()

518

 

            return buf.get_text(buf.get_start_iter(), buf.get_end_iter())

 

532

            return buf.get_text(

 

533

                buf.get_start_iter(), buf.get_end_iter(), True)

519

534

 

520

535

        def get_saved_text(path):

521

536

            """Get the saved text for a given record."""

528

543

        self.assertFalse(dlg._file_message_expander.get_property('sensitive'))

529

544

        self.assertEqual('', get_file_text())

530

545

 

531

 

        dlg._treeview_files.set_cursor((1,))

 

546

        dlg._treeview_files.set_cursor(

 

547

            Gtk.TreePath(path=1), None, False)

532

548

        self.assertEqual('Commit message for a',

533

549

                         dlg._file_message_expander.get_label())

534

550

        self.assertTrue(dlg._file_message_expander.get_expanded())

541

557

        # We should have updated the ListStore with the new file commit info

542

558

        self.assertEqual('Some text\nfor a\n', get_saved_text(1))

543

559

 

544

 

        dlg._treeview_files.set_cursor((2,))

 

560

        dlg._treeview_files.set_cursor(

 

561

            Gtk.TreePath(path=2), None, False)

545

562

        self.assertEqual('Commit message for b/',

546

563

                         dlg._file_message_expander.get_label())

547

564

        self.assertTrue(dlg._file_message_expander.get_expanded())

552

569

        dlg._set_file_commit_message('More text\nfor b\n')

553

570

        # Now switch back to 'a'. The message should be saved, and the buffer

554

571

        # should be updated with the other text

555

 

        dlg._treeview_files.set_cursor((1,))

 

572

        dlg._treeview_files.set_cursor(

 

573

            Gtk.TreePath(path=1), None, False)

556

574

        self.assertEqual('More text\nfor b\n', get_saved_text(2))

557

575

        self.assertEqual('Commit message for a',

558

576

                         dlg._file_message_expander.get_label())

578

596

        #       do with. So instead, we just call toggle directly, and assume

579

597

        #       that toggle is hooked in correctly

580

598

        # column = dlg._treeview_files.get_column(0)

581

 

        # renderer = column.get_cell_renderers()[0]

 

599

        # renderer = column.get_cells()[0]

582

600

 

583

601

        # Toggle a single entry should set just that entry to False

584

602

        dlg._toggle_commit(None, 1, dlg._files_store)

631

649

        dlg._commit_selected_radio.set_active(True)

632

650

        self.assertEqual((['a_file', 'b_dir'], []), dlg._get_specific_files())

633

651

 

634

 

        dlg._treeview_files.set_cursor((1,))

 

652

        dlg._treeview_files.set_cursor(

 

653

            Gtk.TreePath(path=1), None, False)

635

654

        dlg._set_file_commit_message('Test\nmessage\nfor a_file\n')

636

 

        dlg._treeview_files.set_cursor((2,))

 

655

        dlg._treeview_files.set_cursor(

 

656

            Gtk.TreePath(path=2), None, False)

637

657

        dlg._set_file_commit_message('message\nfor b_dir\n')

638

658

 

639

659

        self.assertEqual((['a_file', 'b_dir'],

659

679

        dlg._commit_selected_radio.set_active(True)

660

680

        self.assertEqual((['a_file', 'b_dir'], []), dlg._get_specific_files())

661

681

 

662

 

        dlg._treeview_files.set_cursor((1,))

 

682

        dlg._treeview_files.set_cursor(

 

683

            Gtk.TreePath(path=1), None, False)

663

684

        dlg._set_file_commit_message('Test\r\nmessage\rfor a_file\n')

664

 

        dlg._treeview_files.set_cursor((2,))

 

685

        dlg._treeview_files.set_cursor(

 

686

            Gtk.TreePath(path=2), None, False)

665

687

        dlg._set_file_commit_message('message\r\nfor\nb_dir\r')

666

688

 

667

689

        self.assertEqual((['a_file', 'b_dir'],

680

702

        def _question_yes(*args, **kwargs):

681

703

            self.questions.append(args)

682

704

            self.questions.append('YES')

683

 

            return gtk.RESPONSE_YES

 

705

            return Gtk.ResponseType.YES

684

706

        dlg._question_dialog = _question_yes

685

707

 

686

708

    def _set_question_no(self, dlg):

689

711

        def _question_no(*args, **kwargs):

690

712

            self.questions.append(args)

691

713

            self.questions.append('NO')

692

 

            return gtk.RESPONSE_NO

 

714

            return Gtk.ResponseType.NO

693

715

        dlg._question_dialog = _question_no

694

716

 

695

717

 

974

996

 

975

997

        dlg = commit.CommitDialog(tree)

976

998

        dlg._commit_selected_radio.set_active(True) # enable partial

977

 

        dlg._treeview_files.set_cursor((1,))

 

999

        dlg._treeview_files.set_cursor(

 

1000

            Gtk.TreePath(path=1), None, False)

978

1001

        dlg._set_file_commit_message('Message for A\n')

979

 

        dlg._treeview_files.set_cursor((2,))

 

1002

        dlg._treeview_files.set_cursor(

 

1003

            Gtk.TreePath(path=2), None, False)

980

1004

        dlg._set_file_commit_message('Message for B\n')

981

1005

        dlg._toggle_commit(None, 2, dlg._files_store) # unset 'b'

982

1006

        dlg._set_global_commit_message('Commit just "a"')

1009

1033

        tree.merge_from_branch(tree2.branch)

1010

1034

 

1011

1035

        dlg = commit.CommitDialog(tree)

1012

 

        dlg._treeview_files.set_cursor((1,)) # 'a'

 

1036

        dlg._treeview_files.set_cursor(

 

1037

            Gtk.TreePath(path=1), None, False) # 'a'

1013

1038

        dlg._set_file_commit_message('Message for A\n')

1014

1039

        # No message for 'B'

1015

1040

        dlg._set_global_commit_message('Merging from "tree2"\n')

1032

1057

                         bencode.bdecode(file_info.encode('UTF-8')))

1033

1058

 

1034

1059

    def test_commit_unicode_messages(self):

1035

 

        self.requireFeature(tests.UnicodeFilenameFeature)

 

1060

        self.requireFeature(UnicodeFilenameFeature)

1036

1061

 

1037

1062

        tree = self.make_branch_and_tree('tree')

1038

1063

        tree.branch.get_config().set_user_option('per_file_commits', 'true')

1040

1065

        tree.add(['a', u'\u03a9'], ['a-id', 'omega-id'])

1041

1066

 

1042

1067

        dlg = commit.CommitDialog(tree)

1043

 

        dlg._treeview_files.set_cursor((1,)) # 'a'

 

1068

        dlg._treeview_files.set_cursor(

 

1069

            Gtk.TreePath(path=1), None, False) # 'a'

1044

1070

        dlg._set_file_commit_message(u'Test \xfan\xecc\xf6de\n')

1045

 

        dlg._treeview_files.set_cursor((2,)) # omega

 

1071

        dlg._treeview_files.set_cursor(

 

1072

            Gtk.TreePath(path=2), None, False) # omega

1046

1073

        dlg._set_file_commit_message(u'\u03a9 is the end of all things.\n')

1047

1074

        dlg._set_global_commit_message(u'\u03a9 and \xfan\xecc\xf6de\n')

1048

1075

 

1104

1131

        super(TestSavedCommitMessages, self).setUp()

1105

1132

        # Install our hook

1106

1133

        branch.Branch.hooks.install_named_hook(

1107

 

            'post_uncommit', commit.save_commit_messages, None)

 

1134

            'post_uncommit', commitmsgs.save_commit_messages, None)

1108

1135

 

1109

1136

    def _get_file_info_dict(self, rank):

1110

1137

        file_info = [dict(path='a', file_id='a-id', message='a msg %d' % rank),

• Older »

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