/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to tests/test_commit.py

Merge Johns' gcommit improvements and fix conflicts against trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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')
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,))
830
804
        tree.add(['a', 'b'], ['a-id', 'b-id'])
831
805
 
832
806
        dlg = commit.CommitDialog(tree)
833
 
        dlg._commit_selected_radio.set_active(True) # enable partial
834
807
        dlg._toggle_commit(None, 2, dlg._files_store) # unset 'b'
835
808
 
836
809
        dlg._set_global_commit_message('Committing just "a"\n')
845
818
                                       if path] # Ignore the root entry
846
819
        self.assertEqual([('a', 'a-id')], entries)
847
820
 
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
 
 
874
821
    def test_commit_no_messages(self):
875
822
        tree = self.make_branch_and_tree('tree')
876
823
        rev_id1 = tree.commit('one')
893
840
 
894
841
        dlg = commit.CommitDialog(tree)
895
842
        self.assertFalse(dlg._file_message_expander.get_property('visible'))
896
 
        self.assertEqual('Commit Message',
897
 
                         dlg._global_message_label.get_text())
898
843
 
899
844
        tree.branch.get_config().set_user_option('per_file_commits', 'true')
900
845
        dlg = commit.CommitDialog(tree)
901
846
        self.assertTrue(dlg._file_message_expander.get_property('visible'))
902
 
        self.assertEqual('Global Commit Message',
903
 
                         dlg._global_message_label.get_text())
904
847
 
905
848
        tree.branch.get_config().set_user_option('per_file_commits', 'on')
906
849
        dlg = commit.CommitDialog(tree)
907
850
        self.assertTrue(dlg._file_message_expander.get_property('visible'))
908
 
        self.assertEqual('Global Commit Message',
909
 
                         dlg._global_message_label.get_text())
910
851
 
911
852
        tree.branch.get_config().set_user_option('per_file_commits', 'y')
912
853
        dlg = commit.CommitDialog(tree)
913
854
        self.assertTrue(dlg._file_message_expander.get_property('visible'))
914
 
        self.assertEqual('Global Commit Message',
915
 
                         dlg._global_message_label.get_text())
916
855
 
917
856
        tree.branch.get_config().set_user_option('per_file_commits', 'n')
918
857
        dlg = commit.CommitDialog(tree)
919
858
        self.assertFalse(dlg._file_message_expander.get_property('visible'))
920
 
        self.assertEqual('Commit Message',
921
 
                         dlg._global_message_label.get_text())
922
859
 
923
860
    def test_commit_specific_files_with_messages(self):
924
861
        tree = self.make_branch_and_tree('tree')
928
865
        tree.add(['a', 'b'], ['a-id', 'b-id'])
929
866
 
930
867
        dlg = commit.CommitDialog(tree)
931
 
        dlg._commit_selected_radio.set_active(True) # enable partial
932
868
        dlg._treeview_files.set_cursor((1,))
933
869
        dlg._set_file_commit_message('Message for A\n')
934
870
        dlg._treeview_files.set_cursor((2,))
985
921
                         ], bencode.bdecode(file_info))
986
922
 
987
923
    def test_commit_unicode_messages(self):
988
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
924
        from bzrlib.tests.test_diff import UnicodeFilename
 
925
        self.requireFeature(UnicodeFilename)
989
926
 
990
927
        tree = self.make_branch_and_tree('tree')
991
928
        tree.branch.get_config().set_user_option('per_file_commits', 'true')