/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to tests/test_commit.py

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

• reverse the comparison (278.1.37 to 635.2.3)
• stop comparing with revision 635.2.3

Show diffs side-by-side

added

removed

tests/test_commit.py

1

 

# Copyright (C) 2007, 2008 John Arbash Meinel <john@arbash-meinel.com>

 

1

# Copyright (C) 2007 John Arbash Meinel <john@arbash-meinel.com>

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

81

81

        rev_id1 = tree.commit('one')

82

82

        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()

83

83

        rev_id2 = tree2.commit('two')

 

84

        rev_id3 = tree2.commit('three')

84

85

        tree3 = tree2.bzrdir.sprout('tree3').open_workingtree()

85

 

        rev_id3 = tree2.commit('three')

86

86

        rev_id4 = tree3.commit('four')

87

87

        rev_id5 = tree3.commit('five')

88

88

        tree.merge_from_branch(tree2.branch)

208

208

        commit_col = dlg._treeview_files.get_column(0)

209

209

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

210

210

        renderer = commit_col.get_cell_renderers()[0]

211

 

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

212

 

 

213

 

        self.assertEqual('Commit all changes',

214

 

                         dlg._commit_all_files_radio.get_label())

215

 

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

216

 

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

 

211

        self.assertTrue(renderer.get_active())

217

212

 

218

213

    def test_pending(self):

219

214

        tree = self.make_branch_and_tree('tree')

233

228

        commit_col = dlg._treeview_files.get_column(0)

234

229

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

235

230

        renderer = commit_col.get_cell_renderers()[0]

236

 

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

 

231

        self.assertFalse(renderer.get_active())

237

232

 

238

233

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

239

234

        self.assertEqual([(rev_id2, '2007-10-01', 'Joe Foo', 'two')], values)

240

235

 

241

 

        self.assertEqual('Commit all changes*',

242

 

                         dlg._commit_all_files_radio.get_label())

243

 

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

244

 

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

245

 

 

246

236

    def test_pending_multiple(self):

247

237

        tree = self.make_branch_and_tree('tree')

248

238

        rev_id1 = tree.commit('one')

411

401

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

412

402

                                    diff_buffer.get_end_iter()).splitlines(True)

413

403

 

414

 

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

 

404

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

415

405

        self.assertContainsRe(text[1],

 

406

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

 

407

        self.assertEqual('+++ b\t1970-01-01 00:00:00 +0000\n', text[2])

 

408

        self.assertEqual('@@ -1,1 +0,0 @@\n', text[3])

 

409

        self.assertEqual('-contents of tree/b\n', text[4])

 

410

        self.assertEqual('\n', text[5])

 

411

 

 

412

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

 

413

        self.assertContainsRe(text[7],

416

414

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

417

 

        self.assertContainsRe(text[2],

418

 

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

419

 

        self.assertEqual('@@ -1,1 +1,1 @@\n', text[3])

420

 

        self.assertEqual('-contents of tree/a\n', text[4])

421

 

        self.assertEqual('+new contents for a\n', text[5])

422

 

        self.assertEqual('\n', text[6])

423

 

 

424

 

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

425

415

        self.assertContainsRe(text[8],

426

 

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

427

 

        self.assertEqual('+++ b\t1970-01-01 00:00:00 +0000\n', text[9])

428

 

        self.assertEqual('@@ -1,1 +0,0 @@\n', text[10])

429

 

        self.assertEqual('-contents of tree/b\n', text[11])

 

416

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

 

417

        self.assertEqual('@@ -1,1 +1,1 @@\n', text[9])

 

418

        self.assertEqual('-contents of tree/a\n', text[10])

 

419

        self.assertEqual('+new contents for a\n', text[11])

430

420

        self.assertEqual('\n', text[12])

431

421

 

432

422

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

433

423

 

434

 

    def test_commit_partial_toggle(self):

435

 

        tree = self.make_branch_and_tree('tree')

436

 

        self.build_tree(['tree/a', 'tree/b'])

437

 

        tree.add(['a', 'b'], ['a-id', 'b-id'])

438

 

 

439

 

        dlg = commit.CommitDialog(tree)

440

 

        checked_col = dlg._treeview_files.get_column(0)

441

 

        self.assertFalse(checked_col.get_property('visible'))

442

 

        self.assertTrue(dlg._commit_all_changes)

443

 

 

444

 

        dlg._commit_selected_radio.set_active(True)

445

 

        self.assertTrue(checked_col.get_property('visible'))

446

 

        self.assertFalse(dlg._commit_all_changes)

447

 

 

448

424

    def test_file_selection(self):

449

425

        """Several things should happen when a file has been selected."""

450

426

        tree = self.make_branch_and_tree('tree')

609

585

        dlg = commit.CommitDialog(tree)

610

586

        self.assertEqual((['a', 'b'], []), dlg._get_specific_files())

611

587

 

612

 

        dlg._commit_selected_radio.set_active(True)

613

588

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

614

589

        self.assertEqual(([], []), dlg._get_specific_files())

615

590

 

623

598

        tree.add(['a_file', 'b_dir'], ['1a-id', '0b-id'])

624

599

 

625

600

        dlg = commit.CommitDialog(tree)

626

 

        dlg._commit_selected_radio.set_active(True)

627

601

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

628

602

 

629

603

        dlg._treeview_files.set_cursor((1,))

644

618

                            'message':'message\nfor b_dir\n'},

645

619

                          ]), dlg._get_specific_files())

646

620

 

647

 

    def test_specific_files_sanitizes_messages(self):

648

 

        tree = self.make_branch_and_tree('tree')

649

 

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

650

 

        self.build_tree(['tree/a_file', 'tree/b_dir/'])

651

 

        tree.add(['a_file', 'b_dir'], ['1a-id', '0b-id'])

652

 

 

653

 

        dlg = commit.CommitDialog(tree)

654

 

        dlg._commit_selected_radio.set_active(True)

655

 

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

656

 

 

657

 

        dlg._treeview_files.set_cursor((1,))

658

 

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

659

 

        dlg._treeview_files.set_cursor((2,))

660

 

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

661

 

 

662

 

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

663

 

                          [{'path':'a_file', 'file_id':'1a-id',

664

 

                            'message':'Test\nmessage\nfor a_file\n'},

665

 

                           {'path':'b_dir', 'file_id':'0b-id',

666

 

                            'message':'message\nfor\nb_dir\n'},

667

 

                          ]), dlg._get_specific_files())

668

 

 

669

621

 

670

622

class TestCommitDialog_Commit(tests.TestCaseWithTransport):

671

623

    """Tests on the actual 'commit' button being pushed."""

673

625

    def _set_question_yes(self, dlg):

674

626

        """Set the dialog to answer YES to any questions."""

675

627

        self.questions = []

676

 

        def _question_yes(*args, **kwargs):

 

628

        def _question_yes(*args):

677

629

            self.questions.append(args)

678

630

            self.questions.append('YES')

679

631

            return gtk.RESPONSE_YES

682

634

    def _set_question_no(self, dlg):

683

635

        """Set the dialog to answer NO to any questions."""

684

636

        self.questions = []

685

 

        def _question_no(*args, **kwargs):

 

637

        def _question_no(*args):

686

638

            self.questions.append(args)

687

639

            self.questions.append('NO')

688

640

            return gtk.RESPONSE_NO

709

661

        self.assertEqual(last_rev, dlg.committed_revision_id)

710

662

        self.assertEqual(rev_id1, tree.branch.last_revision())

711

663

 

712

 

    def test_commit_global_sanitizes_message(self):

713

 

        tree = self.make_branch_and_tree('tree')

714

 

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

715

 

        tree.add(['a'], ['a-id'])

716

 

        rev_id1 = tree.commit('one')

717

 

 

718

 

        self.build_tree(['tree/b'])

719

 

        tree.add(['b'], ['b-id'])

720

 

        dlg = commit.CommitDialog(tree)

721

 

        # With the check box set, it should only effect the local branch

722

 

        dlg._set_global_commit_message('Commit\r\nmessage\rfoo\n')

723

 

        dlg._do_commit()

724

 

        rev = tree.branch.repository.get_revision(tree.last_revision())

725

 

        self.assertEqual('Commit\nmessage\nfoo\n', rev.message)

726

 

 

727

664

    def test_bound_commit_both(self):

728

665

        tree = self.make_branch_and_tree('tree')

729

666

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

745

682

        self.assertEqual(last_rev, dlg.committed_revision_id)

746

683

        self.assertEqual(last_rev, tree.branch.last_revision())

747

684

 

748

 

    def test_commit_empty_message(self):

 

685

    def test_commit_no_message(self):

749

686

        tree = self.make_branch_and_tree('tree')

750

687

        self.build_tree(['tree/a', 'tree/b'])

751

688

        tree.add(['a'], ['a-id'])

867

804

        tree.add(['a', 'b'], ['a-id', 'b-id'])

868

805

 

869

806

        dlg = commit.CommitDialog(tree)

870

 

        dlg._commit_selected_radio.set_active(True) # enable partial

871

807

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

872

808

 

873

809

        dlg._set_global_commit_message('Committing just "a"\n')

882

818

                                       if path] # Ignore the root entry

883

819

        self.assertEqual([('a', 'a-id')], entries)

884

820

 

885

 

    def test_commit_partial_no_partial(self):

886

 

        """Ignore the checkboxes if committing all files."""

887

 

        tree = self.make_branch_and_tree('tree')

888

 

        rev_id1 = tree.commit('one')

889

 

        self.build_tree(['tree/a', 'tree/b'])

890

 

        tree.add(['a', 'b'], ['a-id', 'b-id'])

891

 

 

892

 

        dlg = commit.CommitDialog(tree)

893

 

        dlg._commit_selected_radio.set_active(True) # enable partial

894

 

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

895

 

 

896

 

        # Switch back to committing all changes

897

 

        dlg._commit_all_files_radio.set_active(True)

898

 

 

899

 

        dlg._set_global_commit_message('Committing everything\n')

900

 

        dlg._do_commit()

901

 

 

902

 

        rev_id2 = dlg.committed_revision_id

903

 

        self.assertIsNot(None, rev_id2)

904

 

        self.assertEqual(rev_id2, tree.last_revision())

905

 

 

906

 

        rt = tree.branch.repository.revision_tree(rev_id2)

907

 

        entries = [(path, ie.file_id) for path, ie in rt.iter_entries_by_dir()

908

 

                                       if path] # Ignore the root entry

909

 

        self.assertEqual([('a', 'a-id'), ('b', 'b-id')], entries)

910

 

 

911

821

    def test_commit_no_messages(self):

912

822

        tree = self.make_branch_and_tree('tree')

913

823

        rev_id1 = tree.commit('one')

930

840

 

931

841

        dlg = commit.CommitDialog(tree)

932

842

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

933

 

        self.assertEqual('Commit Message',

934

 

                         dlg._global_message_label.get_text())

935

843

 

936

844

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

937

845

        dlg = commit.CommitDialog(tree)

938

846

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

939

 

        self.assertEqual('Global Commit Message',

940

 

                         dlg._global_message_label.get_text())

941

847

 

942

848

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

943

849

        dlg = commit.CommitDialog(tree)

944

850

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

945

 

        self.assertEqual('Global Commit Message',

946

 

                         dlg._global_message_label.get_text())

947

851

 

948

852

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

949

853

        dlg = commit.CommitDialog(tree)

950

854

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

951

 

        self.assertEqual('Global Commit Message',

952

 

                         dlg._global_message_label.get_text())

953

855

 

954

856

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

955

857

        dlg = commit.CommitDialog(tree)

956

858

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

957

 

        self.assertEqual('Commit Message',

958

 

                         dlg._global_message_label.get_text())

959

859

 

960

860

    def test_commit_specific_files_with_messages(self):

961

861

        tree = self.make_branch_and_tree('tree')

965

865

        tree.add(['a', 'b'], ['a-id', 'b-id'])

966

866

 

967

867

        dlg = commit.CommitDialog(tree)

968

 

        dlg._commit_selected_radio.set_active(True) # enable partial

969

868

        dlg._treeview_files.set_cursor((1,))

970

869

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

971

870

        dlg._treeview_files.set_cursor((2,))

1022

921

                         ], bencode.bdecode(file_info))

1023

922

 

1024

923

    def test_commit_unicode_messages(self):

1025

 

        self.requireFeature(tests.UnicodeFilenameFeature)

 

924

        from bzrlib.tests.test_diff import UnicodeFilename

 

925

        self.requireFeature(UnicodeFilename)

1026

926

 

1027

927

        tree = self.make_branch_and_tree('tree')

1028

928

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

1067

967

                          {'path':u'\u03a9', 'file_id':'omega-id',

1068

968

                           'message':u'\u03a9 is the end of all things.\n'},

1069

969

                         ], file_info_decoded)

1070

 

 

1071

 

 

1072

 

class TestSanitizeMessage(tests.TestCase):

1073

 

 

1074

 

    def assertSanitize(self, expected, original):

1075

 

        self.assertEqual(expected,

1076

 

                         commit._sanitize_and_decode_message(original))

1077

 

 

1078

 

    def test_untouched(self):

1079

 

        self.assertSanitize('foo\nbar\nbaz\n', 'foo\nbar\nbaz\n')

1080

 

 

1081

 

    def test_converts_cr_to_lf(self):

1082

 

        self.assertSanitize('foo\nbar\nbaz\n', 'foo\rbar\rbaz\r')

1083

 

 

1084

 

    def test_converts_crlf_to_lf(self):

1085

 

        self.assertSanitize('foo\nbar\nbaz\n', 'foo\r\nbar\r\nbaz\r\n')

1086

 

 

1087

 

    def test_converts_mixed_to_lf(self):

1088

 

        self.assertSanitize('foo\nbar\nbaz\n', 'foo\r\nbar\rbaz\n')

• Older »

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