/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

  • Committer: Mark Lee
  • Date: 2009-07-11 18:39:14 UTC
  • mto: This revision was merged to the branch mainline in revision 661.
  • Revision ID: bzr@lazymalevolence.com-20090711183914-zuii3et5skiv2njo
Re-ignore credits.pickle.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_commit.py
18
18
 
19
19
import os
20
20
 
21
 
from gi.repository import Gtk
 
21
import gtk
22
22
 
23
23
from bzrlib import (
24
24
    branch,
 
25
    revision,
25
26
    tests,
26
27
    uncommit,
27
28
    )
28
29
try:
29
 
    from bzrlib.tests.features import UnicodeFilenameFeature
30
 
except ImportError: # bzr < 2.5
31
 
    from bzrlib.tests import UnicodeFilenameFeature
32
 
try:
33
30
    from bzrlib import bencode
34
31
except ImportError:
35
32
    from bzrlib.util import bencode
36
33
 
37
 
from bzrlib.plugins.gtk import (
38
 
    commit,
39
 
    commitmsgs,
40
 
    )
 
34
from bzrlib.plugins.gtk import commit
41
35
 
42
36
 
43
37
# TODO: All we need is basic ancestry code to test this, we shouldn't need a
97
91
        rev_id4 = tree3.commit('four')
98
92
        rev_id5 = tree3.commit('five')
99
93
        tree.merge_from_branch(tree2.branch)
100
 
        tree.merge_from_branch(tree3.branch, force=True)
 
94
        tree.merge_from_branch(tree3.branch)
101
95
        self.assertEqual([rev_id1, rev_id3, rev_id5], tree.get_parent_ids())
102
96
 
103
97
        pending_revisions = commit.pending_revisions(tree)
218
212
 
219
213
        commit_col = dlg._treeview_files.get_column(0)
220
214
        self.assertEqual('Commit', commit_col.get_title())
221
 
        renderer = commit_col.get_cells()[0]
 
215
        renderer = commit_col.get_cell_renderers()[0]
222
216
        self.assertTrue(renderer.get_property('activatable'))
223
217
 
224
218
        self.assertEqual('Commit all changes',
243
237
 
244
238
        commit_col = dlg._treeview_files.get_column(0)
245
239
        self.assertEqual('Commit*', commit_col.get_title())
246
 
        renderer = commit_col.get_cells()[0]
 
240
        renderer = commit_col.get_cell_renderers()[0]
247
241
        self.assertFalse(renderer.get_property('activatable'))
248
242
 
249
243
        values = [(r[0], r[1], r[2], r[3]) for r in dlg._pending_store]
277
271
                               committer='Jerry Foo <jerry@foo.com>',
278
272
                               timestamp=1191372278.05,
279
273
                               timezone=+7200)
280
 
        tree.merge_from_branch(tree3.branch, force=True)
 
274
        tree.merge_from_branch(tree3.branch)
281
275
 
282
276
        dlg = commit.CommitDialog(tree)
283
277
        # TODO: assert that the pending box is set to show
391
385
                          ('b-id', 'b', True, 'b/', 'removed'),
392
386
                         ], values)
393
387
        # All Files should be selected
394
 
        self.assertEqual(
395
 
            (Gtk.TreePath(path=0), None), dlg._treeview_files.get_cursor())
 
388
        self.assertEqual(((0,), None), dlg._treeview_files.get_cursor())
396
389
 
397
390
    def test_filelist_with_selected(self):
398
391
        tree = self.make_branch_and_tree('tree')
407
400
                         ], values)
408
401
        # This file should also be selected in the file list, rather than the
409
402
        # 'All Files' selection
410
 
        self.assertEqual(
411
 
            (Gtk.TreePath(path=1), None), dlg._treeview_files.get_cursor())
 
403
        self.assertEqual(((1,), None), dlg._treeview_files.get_cursor())
412
404
 
413
405
    def test_diff_view(self):
414
406
        tree = self.make_branch_and_tree('tree')
422
414
        dlg = commit.CommitDialog(tree)
423
415
        diff_buffer = dlg._diff_view.buffer
424
416
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
425
 
                                    diff_buffer.get_end_iter(),
426
 
                                    True).splitlines(True)
 
417
                                    diff_buffer.get_end_iter()).splitlines(True)
427
418
 
428
419
        self.assertEqual("=== modified file 'a'\n", text[0])
429
420
        self.assertContainsRe(text[1],
474
465
        self.assertFalse(dlg._file_message_expander.get_expanded())
475
466
        self.assertFalse(dlg._file_message_expander.get_property('sensitive'))
476
467
 
477
 
        dlg._treeview_files.set_cursor(
478
 
            Gtk.TreePath(path=1), None, False)
 
468
        dlg._treeview_files.set_cursor((1,))
479
469
        self.assertEqual('Diff for a', dlg._diff_label.get_text())
480
470
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
481
 
                                    diff_buffer.get_end_iter(),
482
 
                                    True).splitlines(True)
 
471
                                    diff_buffer.get_end_iter()).splitlines(True)
483
472
        self.assertEqual("=== added file 'a'\n", text[0])
484
473
        self.assertContainsRe(text[1],
485
474
            r"--- a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
493
482
        self.assertTrue(dlg._file_message_expander.get_expanded())
494
483
        self.assertTrue(dlg._file_message_expander.get_property('sensitive'))
495
484
 
496
 
        dlg._treeview_files.set_cursor(
497
 
            Gtk.TreePath(path=2), None, False)
 
485
        dlg._treeview_files.set_cursor((2,))
498
486
        self.assertEqual('Diff for b', dlg._diff_label.get_text())
499
487
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
500
 
                                    diff_buffer.get_end_iter(),
501
 
                                    True).splitlines(True)
 
488
                                    diff_buffer.get_end_iter()).splitlines(True)
502
489
        self.assertEqual("=== added file 'b'\n", text[0])
503
490
        self.assertContainsRe(text[1],
504
491
            r"--- b\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
512
499
        self.assertTrue(dlg._file_message_expander.get_expanded())
513
500
        self.assertTrue(dlg._file_message_expander.get_property('sensitive'))
514
501
 
515
 
        dlg._treeview_files.set_cursor(
516
 
            Gtk.TreePath(path=0), None, False)
 
502
        dlg._treeview_files.set_cursor((0,))
517
503
        self.assertEqual('Diff for All Files', dlg._diff_label.get_text())
518
504
        self.assertEqual('File commit message',
519
505
                         dlg._file_message_expander.get_label())
529
515
 
530
516
        def get_file_text():
531
517
            buf = dlg._file_message_text_view.get_buffer()
532
 
            return buf.get_text(
533
 
                buf.get_start_iter(), buf.get_end_iter(), True)
 
518
            return buf.get_text(buf.get_start_iter(), buf.get_end_iter())
534
519
 
535
520
        def get_saved_text(path):
536
521
            """Get the saved text for a given record."""
543
528
        self.assertFalse(dlg._file_message_expander.get_property('sensitive'))
544
529
        self.assertEqual('', get_file_text())
545
530
 
546
 
        dlg._treeview_files.set_cursor(
547
 
            Gtk.TreePath(path=1), None, False)
 
531
        dlg._treeview_files.set_cursor((1,))
548
532
        self.assertEqual('Commit message for a',
549
533
                         dlg._file_message_expander.get_label())
550
534
        self.assertTrue(dlg._file_message_expander.get_expanded())
557
541
        # We should have updated the ListStore with the new file commit info
558
542
        self.assertEqual('Some text\nfor a\n', get_saved_text(1))
559
543
 
560
 
        dlg._treeview_files.set_cursor(
561
 
            Gtk.TreePath(path=2), None, False)
 
544
        dlg._treeview_files.set_cursor((2,))
562
545
        self.assertEqual('Commit message for b/',
563
546
                         dlg._file_message_expander.get_label())
564
547
        self.assertTrue(dlg._file_message_expander.get_expanded())
569
552
        dlg._set_file_commit_message('More text\nfor b\n')
570
553
        # Now switch back to 'a'. The message should be saved, and the buffer
571
554
        # should be updated with the other text
572
 
        dlg._treeview_files.set_cursor(
573
 
            Gtk.TreePath(path=1), None, False)
 
555
        dlg._treeview_files.set_cursor((1,))
574
556
        self.assertEqual('More text\nfor b\n', get_saved_text(2))
575
557
        self.assertEqual('Commit message for a',
576
558
                         dlg._file_message_expander.get_label())
596
578
        #       do with. So instead, we just call toggle directly, and assume
597
579
        #       that toggle is hooked in correctly
598
580
        # column = dlg._treeview_files.get_column(0)
599
 
        # renderer = column.get_cells()[0]
 
581
        # renderer = column.get_cell_renderers()[0]
600
582
 
601
583
        # Toggle a single entry should set just that entry to False
602
584
        dlg._toggle_commit(None, 1, dlg._files_store)
649
631
        dlg._commit_selected_radio.set_active(True)
650
632
        self.assertEqual((['a_file', 'b_dir'], []), dlg._get_specific_files())
651
633
 
652
 
        dlg._treeview_files.set_cursor(
653
 
            Gtk.TreePath(path=1), None, False)
 
634
        dlg._treeview_files.set_cursor((1,))
654
635
        dlg._set_file_commit_message('Test\nmessage\nfor a_file\n')
655
 
        dlg._treeview_files.set_cursor(
656
 
            Gtk.TreePath(path=2), None, False)
 
636
        dlg._treeview_files.set_cursor((2,))
657
637
        dlg._set_file_commit_message('message\nfor b_dir\n')
658
638
 
659
639
        self.assertEqual((['a_file', 'b_dir'],
679
659
        dlg._commit_selected_radio.set_active(True)
680
660
        self.assertEqual((['a_file', 'b_dir'], []), dlg._get_specific_files())
681
661
 
682
 
        dlg._treeview_files.set_cursor(
683
 
            Gtk.TreePath(path=1), None, False)
 
662
        dlg._treeview_files.set_cursor((1,))
684
663
        dlg._set_file_commit_message('Test\r\nmessage\rfor a_file\n')
685
 
        dlg._treeview_files.set_cursor(
686
 
            Gtk.TreePath(path=2), None, False)
 
664
        dlg._treeview_files.set_cursor((2,))
687
665
        dlg._set_file_commit_message('message\r\nfor\nb_dir\r')
688
666
 
689
667
        self.assertEqual((['a_file', 'b_dir'],
702
680
        def _question_yes(*args, **kwargs):
703
681
            self.questions.append(args)
704
682
            self.questions.append('YES')
705
 
            return Gtk.ResponseType.YES
 
683
            return gtk.RESPONSE_YES
706
684
        dlg._question_dialog = _question_yes
707
685
 
708
686
    def _set_question_no(self, dlg):
711
689
        def _question_no(*args, **kwargs):
712
690
            self.questions.append(args)
713
691
            self.questions.append('NO')
714
 
            return Gtk.ResponseType.NO
 
692
            return gtk.RESPONSE_NO
715
693
        dlg._question_dialog = _question_no
716
694
 
717
695
 
996
974
 
997
975
        dlg = commit.CommitDialog(tree)
998
976
        dlg._commit_selected_radio.set_active(True) # enable partial
999
 
        dlg._treeview_files.set_cursor(
1000
 
            Gtk.TreePath(path=1), None, False)
 
977
        dlg._treeview_files.set_cursor((1,))
1001
978
        dlg._set_file_commit_message('Message for A\n')
1002
 
        dlg._treeview_files.set_cursor(
1003
 
            Gtk.TreePath(path=2), None, False)
 
979
        dlg._treeview_files.set_cursor((2,))
1004
980
        dlg._set_file_commit_message('Message for B\n')
1005
981
        dlg._toggle_commit(None, 2, dlg._files_store) # unset 'b'
1006
982
        dlg._set_global_commit_message('Commit just "a"')
1012
988
        rev = tree.branch.repository.get_revision(rev_id2)
1013
989
        self.assertEqual('Commit just "a"', rev.message)
1014
990
        file_info = rev.properties['file-info']
1015
 
        self.assertEqual(u'ld7:file_id4:a-id'
1016
 
                         '7:message14:Message for A\n'
1017
 
                         '4:path1:a'
1018
 
                         'ee',
1019
 
                         file_info)
 
991
        self.assertEqual('ld7:file_id4:a-id'
 
992
                           '7:message14:Message for A\n'
 
993
                           '4:path1:a'
 
994
                         'ee', file_info)
1020
995
        self.assertEqual([{'path':'a', 'file_id':'a-id',
1021
 
                           'message':'Message for A\n'},],
1022
 
                         bencode.bdecode(file_info.encode('UTF-8')))
 
996
                           'message':'Message for A\n'},
 
997
                         ], bencode.bdecode(file_info))
1023
998
 
1024
999
    def test_commit_messages_after_merge(self):
1025
1000
        tree = self.make_branch_and_tree('tree')
1033
1008
        tree.merge_from_branch(tree2.branch)
1034
1009
 
1035
1010
        dlg = commit.CommitDialog(tree)
1036
 
        dlg._treeview_files.set_cursor(
1037
 
            Gtk.TreePath(path=1), None, False) # 'a'
 
1011
        dlg._treeview_files.set_cursor((1,)) # 'a'
1038
1012
        dlg._set_file_commit_message('Message for A\n')
1039
1013
        # No message for 'B'
1040
1014
        dlg._set_global_commit_message('Merging from "tree2"\n')
1047
1021
        self.assertEqual('Merging from "tree2"\n', rev.message)
1048
1022
        self.assertEqual([rev_id1, rev_id2], rev.parent_ids)
1049
1023
        file_info = rev.properties['file-info']
1050
 
        self.assertEqual(u'ld7:file_id4:a-id'
1051
 
                         '7:message14:Message for A\n'
1052
 
                         '4:path1:a'
1053
 
                         'ee',
1054
 
                         file_info)
 
1024
        self.assertEqual('ld7:file_id4:a-id'
 
1025
                           '7:message14:Message for A\n'
 
1026
                           '4:path1:a'
 
1027
                         'ee', file_info)
1055
1028
        self.assertEqual([{'path':'a', 'file_id':'a-id',
1056
 
                           'message':'Message for A\n'},],
1057
 
                         bencode.bdecode(file_info.encode('UTF-8')))
 
1029
                           'message':'Message for A\n'},
 
1030
                         ], bencode.bdecode(file_info))
1058
1031
 
1059
1032
    def test_commit_unicode_messages(self):
1060
 
        self.requireFeature(UnicodeFilenameFeature)
 
1033
        self.requireFeature(tests.UnicodeFilenameFeature)
1061
1034
 
1062
1035
        tree = self.make_branch_and_tree('tree')
1063
1036
        tree.branch.get_config().set_user_option('per_file_commits', 'true')
1065
1038
        tree.add(['a', u'\u03a9'], ['a-id', 'omega-id'])
1066
1039
 
1067
1040
        dlg = commit.CommitDialog(tree)
1068
 
        dlg._treeview_files.set_cursor(
1069
 
            Gtk.TreePath(path=1), None, False) # 'a'
 
1041
        dlg._treeview_files.set_cursor((1,)) # 'a'
1070
1042
        dlg._set_file_commit_message(u'Test \xfan\xecc\xf6de\n')
1071
 
        dlg._treeview_files.set_cursor(
1072
 
            Gtk.TreePath(path=2), None, False) # omega
 
1043
        dlg._treeview_files.set_cursor((2,)) # omega
1073
1044
        dlg._set_file_commit_message(u'\u03a9 is the end of all things.\n')
1074
1045
        dlg._set_global_commit_message(u'\u03a9 and \xfan\xecc\xf6de\n')
1075
1046
 
1131
1102
        super(TestSavedCommitMessages, self).setUp()
1132
1103
        # Install our hook
1133
1104
        branch.Branch.hooks.install_named_hook(
1134
 
            'post_uncommit', commitmsgs.save_commit_messages, None)
 
1105
            'post_uncommit', commit.save_commit_messages, None)
1135
1106
 
1136
1107
    def _get_file_info_dict(self, rank):
1137
1108
        file_info = [dict(path='a', file_id='a-id', message='a msg %d' % rank),