/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to tests/test_commit.py

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

• reverse the comparison (577.1.1 to 278.1.29)
• stop comparing with revision 278.1.29

Show diffs side-by-side

added

removed

tests/test_commit.py

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')

85

84

        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_active())

 

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'))

212

217

 

213

218

    def test_pending(self):

214

219

        tree = self.make_branch_and_tree('tree')

228

233

        commit_col = dlg._treeview_files.get_column(0)

229

234

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

230

235

        renderer = commit_col.get_cell_renderers()[0]

231

 

        self.assertFalse(renderer.get_active())

 

236

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

232

237

 

233

238

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

234

239

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

235

240

 

 

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

 

236

246

    def test_pending_multiple(self):

237

247

        tree = self.make_branch_and_tree('tree')

238

248

        rev_id1 = tree.commit('one')

369

379

                          ('a-id', 'a', True, 'a', 'removed'),

370

380

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

371

381

                         ], values)

 

382

        # All Files should be selected

 

383

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

 

384

 

 

385

    def test_filelist_with_selected(self):

 

386

        tree = self.make_branch_and_tree('tree')

 

387

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

 

388

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

 

389

 

 

390

        dlg = commit.CommitDialog(tree, selected='a')

 

391

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

 

392

        self.assertEqual([(None, None, False, 'All Files', ''),

 

393

                          ('a-id', 'a', True, 'a', 'added'),

 

394

                          ('b-id', 'b', False, 'b/', 'added'),

 

395

                         ], values)

 

396

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

 

397

        # 'All Files' selection

 

398

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

372

399

 

373

400

    def test_diff_view(self):

374

401

        tree = self.make_branch_and_tree('tree')

384

411

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

385

412

                                    diff_buffer.get_end_iter()).splitlines(True)

386

413

 

387

 

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

 

414

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

388

415

        self.assertContainsRe(text[1],

389

 

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

390

 

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

391

 

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

392

 

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

393

 

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

394

 

 

395

 

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

396

 

        self.assertContainsRe(text[7],

397

416

            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])

398

425

        self.assertContainsRe(text[8],

399

 

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

400

 

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

401

 

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

402

 

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

 

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])

403

430

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

404

431

 

405

432

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

406

433

 

 

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

 

407

448

    def test_file_selection(self):

408

449

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

409

450

        tree = self.make_branch_and_tree('tree')

 

451

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

410

452

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

411

453

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

412

454

 

462

504

    def test_file_selection_message(self):

463

505

        """Selecting a file should bring up its commit message."""

464

506

        tree = self.make_branch_and_tree('tree')

 

507

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

465

508

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

466

509

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

467

510

 

566

609

        dlg = commit.CommitDialog(tree)

567

610

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

568

611

 

 

612

        dlg._commit_selected_radio.set_active(True)

569

613

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

570

614

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

571

615

 

574

618

 

575

619

    def test_specific_files_with_messages(self):

576

620

        tree = self.make_branch_and_tree('tree')

 

621

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

577

622

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

578

623

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

579

624

 

580

625

        dlg = commit.CommitDialog(tree)

 

626

        dlg._commit_selected_radio.set_active(True)

581

627

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

582

628

 

583

629

        dlg._treeview_files.set_cursor((1,))

784

830

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

785

831

 

786

832

        dlg = commit.CommitDialog(tree)

 

833

        dlg._commit_selected_radio.set_active(True) # enable partial

787

834

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

788

835

 

789

836

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

798

845

                                       if path] # Ignore the root entry

799

846

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

800

847

 

 

848

    def test_commit_partial_no_partial(self):

 

849

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

 

850

        tree = self.make_branch_and_tree('tree')

 

851

        rev_id1 = tree.commit('one')

 

852

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

 

853

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

 

854

 

 

855

        dlg = commit.CommitDialog(tree)

 

856

        dlg._commit_selected_radio.set_active(True) # enable partial

 

857

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

 

858

 

 

859

        # Switch back to committing all changes

 

860

        dlg._commit_all_files_radio.set_active(True)

 

861

 

 

862

        dlg._set_global_commit_message('Committing everything\n')

 

863

        dlg._do_commit()

 

864

 

 

865

        rev_id2 = dlg.committed_revision_id

 

866

        self.assertIsNot(None, rev_id2)

 

867

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

 

868

 

 

869

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

 

870

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

 

871

                                       if path] # Ignore the root entry

 

872

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

 

873

 

801

874

    def test_commit_no_messages(self):

802

875

        tree = self.make_branch_and_tree('tree')

803

876

        rev_id1 = tree.commit('one')

811

884

        rev = tree.branch.repository.get_revision(dlg.committed_revision_id)

812

885

        self.failIf('file-info' in rev.properties)

813

886

 

 

887

    def test_commit_disabled_messages(self):

 

888

        tree = self.make_branch_and_tree('tree')

 

889

        rev_id1 = tree.commit('one')

 

890

 

 

891

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

 

892

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

 

893

 

 

894

        dlg = commit.CommitDialog(tree)

 

895

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

 

896

        self.assertEqual('Commit Message',

 

897

                         dlg._global_message_label.get_text())

 

898

 

 

899

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

 

900

        dlg = commit.CommitDialog(tree)

 

901

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

 

902

        self.assertEqual('Global Commit Message',

 

903

                         dlg._global_message_label.get_text())

 

904

 

 

905

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

 

906

        dlg = commit.CommitDialog(tree)

 

907

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

 

908

        self.assertEqual('Global Commit Message',

 

909

                         dlg._global_message_label.get_text())

 

910

 

 

911

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

 

912

        dlg = commit.CommitDialog(tree)

 

913

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

 

914

        self.assertEqual('Global Commit Message',

 

915

                         dlg._global_message_label.get_text())

 

916

 

 

917

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

 

918

        dlg = commit.CommitDialog(tree)

 

919

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

 

920

        self.assertEqual('Commit Message',

 

921

                         dlg._global_message_label.get_text())

 

922

 

814

923

    def test_commit_specific_files_with_messages(self):

815

924

        tree = self.make_branch_and_tree('tree')

 

925

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

816

926

        rev_id1 = tree.commit('one')

817

927

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

818

928

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

819

929

 

820

930

        dlg = commit.CommitDialog(tree)

 

931

        dlg._commit_selected_radio.set_active(True) # enable partial

821

932

        dlg._treeview_files.set_cursor((1,))

822

933

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

823

934

        dlg._treeview_files.set_cursor((2,))

842

953

 

843

954

    def test_commit_messages_after_merge(self):

844

955

        tree = self.make_branch_and_tree('tree')

 

956

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

845

957

        rev_id1 = tree.commit('one')

846

958

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

847

959

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

873

985

                         ], bencode.bdecode(file_info))

874

986

 

875

987

    def test_commit_unicode_messages(self):

876

 

        from bzrlib.tests.test_diff import UnicodeFilename

877

 

        self.requireFeature(UnicodeFilename)

 

988

        self.requireFeature(tests.UnicodeFilenameFeature)

878

989

 

879

990

        tree = self.make_branch_and_tree('tree')

 

991

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

880

992

        self.build_tree(['tree/a', u'tree/\u03a9'])

881

993

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

882

994

 

897

1009

        dlg._do_commit()

898

1010

 

899

1011

        rev = tree.branch.repository.get_revision(dlg.committed_revision_id)

900

 

        file_info = rev.properties['file-info']

 

1012

        file_info = rev.properties['file-info'].encode('UTF-8')

901

1013

        value = ('ld7:file_id4:a-id'

902

1014

                   '7:message16:Test \xc3\xban\xc3\xacc\xc3\xb6de\n'

903

1015

                   '4:path1:a'

907

1019

                   '4:path2:\xce\xa9'

908

1020

                  'e'

909

1021

                 'e')

910

 

        self.expectFailure('bencode and unicode does not mix properly with'

911

 

                           ' Revision XML serialization.',

912

 

                           self.assertEqual, value, file_info)

913

1022

        self.assertEqual(value, file_info)

914

1023

        file_info_decoded = bencode.bdecode(file_info)

915

1024

        for d in file_info_decoded:

916

 

            d['path'] = d['path'].decode('utf8')

917

 

            d['message'] = d['message'].decode('utf8')

 

1025

            d['path'] = d['path'].decode('UTF-8')

 

1026

            d['message'] = d['message'].decode('UTF-8')

918

1027

 

919

1028

        self.assertEqual([{'path':u'a', 'file_id':'a-id',

920

1029

                           'message':u'Test \xfan\xecc\xf6de\n'},

• Older »

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