/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: David Planella
  • Date: 2010-08-21 09:38:06 UTC
  • mto: This revision was merged to the branch mainline in revision 719.
  • Revision ID: david.planella@ubuntu.com-20100821093806-9u7cq5gcaml6k2ln
Added the rest of files necessary for i18n support in the build system

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
49
43
        tree = self.make_branch_and_tree('.')
50
44
        tree.commit('one')
51
45
 
52
 
        self.addCleanup(tree.lock_read().unlock)
53
46
        self.assertIs(None, commit.pending_revisions(tree))
54
47
 
55
48
    def test_pending_revisions_simple(self):
60
53
        tree.merge_from_branch(tree2.branch)
61
54
        self.assertEqual([rev_id1, rev_id2], tree.get_parent_ids())
62
55
 
63
 
        self.addCleanup(tree.lock_read().unlock)
64
56
        pending_revisions = commit.pending_revisions(tree)
65
57
        # One primary merge
66
58
        self.assertEqual(1, len(pending_revisions))
79
71
        tree.merge_from_branch(tree2.branch)
80
72
        self.assertEqual([rev_id1, rev_id4], tree.get_parent_ids())
81
73
 
82
 
        self.addCleanup(tree.lock_read().unlock)
83
74
        pending_revisions = commit.pending_revisions(tree)
84
75
        # One primary merge
85
76
        self.assertEqual(1, len(pending_revisions))
103
94
        tree.merge_from_branch(tree3.branch, force=True)
104
95
        self.assertEqual([rev_id1, rev_id3, rev_id5], tree.get_parent_ids())
105
96
 
106
 
        self.addCleanup(tree.lock_read().unlock)
107
97
        pending_revisions = commit.pending_revisions(tree)
108
98
        # Two primary merges
109
99
        self.assertEqual(2, len(pending_revisions))
222
212
 
223
213
        commit_col = dlg._treeview_files.get_column(0)
224
214
        self.assertEqual('Commit', commit_col.get_title())
225
 
        renderer = commit_col.get_cells()[0]
 
215
        renderer = commit_col.get_cell_renderers()[0]
226
216
        self.assertTrue(renderer.get_property('activatable'))
227
217
 
228
218
        self.assertEqual('Commit all changes',
247
237
 
248
238
        commit_col = dlg._treeview_files.get_column(0)
249
239
        self.assertEqual('Commit*', commit_col.get_title())
250
 
        renderer = commit_col.get_cells()[0]
 
240
        renderer = commit_col.get_cell_renderers()[0]
251
241
        self.assertFalse(renderer.get_property('activatable'))
252
242
 
253
243
        values = [(r[0], r[1], r[2], r[3]) for r in dlg._pending_store]
395
385
                          ('b-id', 'b', True, 'b/', 'removed'),
396
386
                         ], values)
397
387
        # All Files should be selected
398
 
        self.assertEqual(
399
 
            (Gtk.TreePath(path=0), None), dlg._treeview_files.get_cursor())
 
388
        self.assertEqual(((0,), None), dlg._treeview_files.get_cursor())
400
389
 
401
390
    def test_filelist_with_selected(self):
402
391
        tree = self.make_branch_and_tree('tree')
411
400
                         ], values)
412
401
        # This file should also be selected in the file list, rather than the
413
402
        # 'All Files' selection
414
 
        self.assertEqual(
415
 
            (Gtk.TreePath(path=1), None), dlg._treeview_files.get_cursor())
 
403
        self.assertEqual(((1,), None), dlg._treeview_files.get_cursor())
416
404
 
417
405
    def test_diff_view(self):
418
406
        tree = self.make_branch_and_tree('tree')
426
414
        dlg = commit.CommitDialog(tree)
427
415
        diff_buffer = dlg._diff_view.buffer
428
416
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
429
 
                                    diff_buffer.get_end_iter(),
430
 
                                    True).splitlines(True)
 
417
                                    diff_buffer.get_end_iter()).splitlines(True)
431
418
 
432
419
        self.assertEqual("=== modified file 'a'\n", text[0])
433
420
        self.assertContainsRe(text[1],
478
465
        self.assertFalse(dlg._file_message_expander.get_expanded())
479
466
        self.assertFalse(dlg._file_message_expander.get_property('sensitive'))
480
467
 
481
 
        dlg._treeview_files.set_cursor(
482
 
            Gtk.TreePath(path=1), None, False)
 
468
        dlg._treeview_files.set_cursor((1,))
483
469
        self.assertEqual('Diff for a', dlg._diff_label.get_text())
484
470
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
485
 
                                    diff_buffer.get_end_iter(),
486
 
                                    True).splitlines(True)
 
471
                                    diff_buffer.get_end_iter()).splitlines(True)
487
472
        self.assertEqual("=== added file 'a'\n", text[0])
488
473
        self.assertContainsRe(text[1],
489
474
            r"--- a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
497
482
        self.assertTrue(dlg._file_message_expander.get_expanded())
498
483
        self.assertTrue(dlg._file_message_expander.get_property('sensitive'))
499
484
 
500
 
        dlg._treeview_files.set_cursor(
501
 
            Gtk.TreePath(path=2), None, False)
 
485
        dlg._treeview_files.set_cursor((2,))
502
486
        self.assertEqual('Diff for b', dlg._diff_label.get_text())
503
487
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
504
 
                                    diff_buffer.get_end_iter(),
505
 
                                    True).splitlines(True)
 
488
                                    diff_buffer.get_end_iter()).splitlines(True)
506
489
        self.assertEqual("=== added file 'b'\n", text[0])
507
490
        self.assertContainsRe(text[1],
508
491
            r"--- b\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
516
499
        self.assertTrue(dlg._file_message_expander.get_expanded())
517
500
        self.assertTrue(dlg._file_message_expander.get_property('sensitive'))
518
501
 
519
 
        dlg._treeview_files.set_cursor(
520
 
            Gtk.TreePath(path=0), None, False)
 
502
        dlg._treeview_files.set_cursor((0,))
521
503
        self.assertEqual('Diff for All Files', dlg._diff_label.get_text())
522
504
        self.assertEqual('File commit message',
523
505
                         dlg._file_message_expander.get_label())
533
515
 
534
516
        def get_file_text():
535
517
            buf = dlg._file_message_text_view.get_buffer()
536
 
            return buf.get_text(
537
 
                buf.get_start_iter(), buf.get_end_iter(), True)
 
518
            return buf.get_text(buf.get_start_iter(), buf.get_end_iter())
538
519
 
539
520
        def get_saved_text(path):
540
521
            """Get the saved text for a given record."""
547
528
        self.assertFalse(dlg._file_message_expander.get_property('sensitive'))
548
529
        self.assertEqual('', get_file_text())
549
530
 
550
 
        dlg._treeview_files.set_cursor(
551
 
            Gtk.TreePath(path=1), None, False)
 
531
        dlg._treeview_files.set_cursor((1,))
552
532
        self.assertEqual('Commit message for a',
553
533
                         dlg._file_message_expander.get_label())
554
534
        self.assertTrue(dlg._file_message_expander.get_expanded())
561
541
        # We should have updated the ListStore with the new file commit info
562
542
        self.assertEqual('Some text\nfor a\n', get_saved_text(1))
563
543
 
564
 
        dlg._treeview_files.set_cursor(
565
 
            Gtk.TreePath(path=2), None, False)
 
544
        dlg._treeview_files.set_cursor((2,))
566
545
        self.assertEqual('Commit message for b/',
567
546
                         dlg._file_message_expander.get_label())
568
547
        self.assertTrue(dlg._file_message_expander.get_expanded())
573
552
        dlg._set_file_commit_message('More text\nfor b\n')
574
553
        # Now switch back to 'a'. The message should be saved, and the buffer
575
554
        # should be updated with the other text
576
 
        dlg._treeview_files.set_cursor(
577
 
            Gtk.TreePath(path=1), None, False)
 
555
        dlg._treeview_files.set_cursor((1,))
578
556
        self.assertEqual('More text\nfor b\n', get_saved_text(2))
579
557
        self.assertEqual('Commit message for a',
580
558
                         dlg._file_message_expander.get_label())
600
578
        #       do with. So instead, we just call toggle directly, and assume
601
579
        #       that toggle is hooked in correctly
602
580
        # column = dlg._treeview_files.get_column(0)
603
 
        # renderer = column.get_cells()[0]
 
581
        # renderer = column.get_cell_renderers()[0]
604
582
 
605
583
        # Toggle a single entry should set just that entry to False
606
584
        dlg._toggle_commit(None, 1, dlg._files_store)
653
631
        dlg._commit_selected_radio.set_active(True)
654
632
        self.assertEqual((['a_file', 'b_dir'], []), dlg._get_specific_files())
655
633
 
656
 
        dlg._treeview_files.set_cursor(
657
 
            Gtk.TreePath(path=1), None, False)
 
634
        dlg._treeview_files.set_cursor((1,))
658
635
        dlg._set_file_commit_message('Test\nmessage\nfor a_file\n')
659
 
        dlg._treeview_files.set_cursor(
660
 
            Gtk.TreePath(path=2), None, False)
 
636
        dlg._treeview_files.set_cursor((2,))
661
637
        dlg._set_file_commit_message('message\nfor b_dir\n')
662
638
 
663
639
        self.assertEqual((['a_file', 'b_dir'],
683
659
        dlg._commit_selected_radio.set_active(True)
684
660
        self.assertEqual((['a_file', 'b_dir'], []), dlg._get_specific_files())
685
661
 
686
 
        dlg._treeview_files.set_cursor(
687
 
            Gtk.TreePath(path=1), None, False)
 
662
        dlg._treeview_files.set_cursor((1,))
688
663
        dlg._set_file_commit_message('Test\r\nmessage\rfor a_file\n')
689
 
        dlg._treeview_files.set_cursor(
690
 
            Gtk.TreePath(path=2), None, False)
 
664
        dlg._treeview_files.set_cursor((2,))
691
665
        dlg._set_file_commit_message('message\r\nfor\nb_dir\r')
692
666
 
693
667
        self.assertEqual((['a_file', 'b_dir'],
706
680
        def _question_yes(*args, **kwargs):
707
681
            self.questions.append(args)
708
682
            self.questions.append('YES')
709
 
            return Gtk.ResponseType.YES
 
683
            return gtk.RESPONSE_YES
710
684
        dlg._question_dialog = _question_yes
711
685
 
712
686
    def _set_question_no(self, dlg):
715
689
        def _question_no(*args, **kwargs):
716
690
            self.questions.append(args)
717
691
            self.questions.append('NO')
718
 
            return Gtk.ResponseType.NO
 
692
            return gtk.RESPONSE_NO
719
693
        dlg._question_dialog = _question_no
720
694
 
721
695
 
1000
974
 
1001
975
        dlg = commit.CommitDialog(tree)
1002
976
        dlg._commit_selected_radio.set_active(True) # enable partial
1003
 
        dlg._treeview_files.set_cursor(
1004
 
            Gtk.TreePath(path=1), None, False)
 
977
        dlg._treeview_files.set_cursor((1,))
1005
978
        dlg._set_file_commit_message('Message for A\n')
1006
 
        dlg._treeview_files.set_cursor(
1007
 
            Gtk.TreePath(path=2), None, False)
 
979
        dlg._treeview_files.set_cursor((2,))
1008
980
        dlg._set_file_commit_message('Message for B\n')
1009
981
        dlg._toggle_commit(None, 2, dlg._files_store) # unset 'b'
1010
982
        dlg._set_global_commit_message('Commit just "a"')
1037
1009
        tree.merge_from_branch(tree2.branch)
1038
1010
 
1039
1011
        dlg = commit.CommitDialog(tree)
1040
 
        dlg._treeview_files.set_cursor(
1041
 
            Gtk.TreePath(path=1), None, False) # 'a'
 
1012
        dlg._treeview_files.set_cursor((1,)) # 'a'
1042
1013
        dlg._set_file_commit_message('Message for A\n')
1043
1014
        # No message for 'B'
1044
1015
        dlg._set_global_commit_message('Merging from "tree2"\n')
1061
1032
                         bencode.bdecode(file_info.encode('UTF-8')))
1062
1033
 
1063
1034
    def test_commit_unicode_messages(self):
1064
 
        self.requireFeature(UnicodeFilenameFeature)
 
1035
        self.requireFeature(tests.UnicodeFilenameFeature)
1065
1036
 
1066
1037
        tree = self.make_branch_and_tree('tree')
1067
1038
        tree.branch.get_config().set_user_option('per_file_commits', 'true')
1069
1040
        tree.add(['a', u'\u03a9'], ['a-id', 'omega-id'])
1070
1041
 
1071
1042
        dlg = commit.CommitDialog(tree)
1072
 
        dlg._treeview_files.set_cursor(
1073
 
            Gtk.TreePath(path=1), None, False) # 'a'
 
1043
        dlg._treeview_files.set_cursor((1,)) # 'a'
1074
1044
        dlg._set_file_commit_message(u'Test \xfan\xecc\xf6de\n')
1075
 
        dlg._treeview_files.set_cursor(
1076
 
            Gtk.TreePath(path=2), None, False) # omega
 
1045
        dlg._treeview_files.set_cursor((2,)) # omega
1077
1046
        dlg._set_file_commit_message(u'\u03a9 is the end of all things.\n')
1078
1047
        dlg._set_global_commit_message(u'\u03a9 and \xfan\xecc\xf6de\n')
1079
1048
 
1135
1104
        super(TestSavedCommitMessages, self).setUp()
1136
1105
        # Install our hook
1137
1106
        branch.Branch.hooks.install_named_hook(
1138
 
            'post_uncommit', commitmsgs.save_commit_messages, None)
 
1107
            'post_uncommit', commit.save_commit_messages, None)
1139
1108
 
1140
1109
    def _get_file_info_dict(self, rank):
1141
1110
        file_info = [dict(path='a', file_id='a-id', message='a msg %d' % rank),