/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: Jelmer Vernooij
  • Date: 2011-08-23 23:53:59 UTC
  • Revision ID: jelmer@samba.org-20110823235359-0k7mlydx8txgvw9x
Mark as supporting bzr 2.5.0.

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,
26
26
    uncommit,
27
27
    )
28
28
try:
29
 
    from bzrlib.tests.features import UnicodeFilenameFeature
30
 
except ImportError: # bzr < 2.5
31
 
    from bzrlib.tests import UnicodeFilenameFeature
32
 
try:
33
29
    from bzrlib import bencode
34
30
except ImportError:
35
31
    from bzrlib.util import bencode
36
32
 
37
 
from bzrlib.plugins.gtk import (
38
 
    commit,
39
 
    commitmsgs,
40
 
    )
 
33
from bzrlib.plugins.gtk import commit
41
34
 
42
35
 
43
36
# TODO: All we need is basic ancestry code to test this, we shouldn't need a
218
211
 
219
212
        commit_col = dlg._treeview_files.get_column(0)
220
213
        self.assertEqual('Commit', commit_col.get_title())
221
 
        renderer = commit_col.get_cells()[0]
 
214
        renderer = commit_col.get_cell_renderers()[0]
222
215
        self.assertTrue(renderer.get_property('activatable'))
223
216
 
224
217
        self.assertEqual('Commit all changes',
243
236
 
244
237
        commit_col = dlg._treeview_files.get_column(0)
245
238
        self.assertEqual('Commit*', commit_col.get_title())
246
 
        renderer = commit_col.get_cells()[0]
 
239
        renderer = commit_col.get_cell_renderers()[0]
247
240
        self.assertFalse(renderer.get_property('activatable'))
248
241
 
249
242
        values = [(r[0], r[1], r[2], r[3]) for r in dlg._pending_store]
391
384
                          ('b-id', 'b', True, 'b/', 'removed'),
392
385
                         ], values)
393
386
        # All Files should be selected
394
 
        self.assertEqual(
395
 
            (Gtk.TreePath(path=0), None), dlg._treeview_files.get_cursor())
 
387
        self.assertEqual(((0,), None), dlg._treeview_files.get_cursor())
396
388
 
397
389
    def test_filelist_with_selected(self):
398
390
        tree = self.make_branch_and_tree('tree')
407
399
                         ], values)
408
400
        # This file should also be selected in the file list, rather than the
409
401
        # 'All Files' selection
410
 
        self.assertEqual(
411
 
            (Gtk.TreePath(path=1), None), dlg._treeview_files.get_cursor())
 
402
        self.assertEqual(((1,), None), dlg._treeview_files.get_cursor())
412
403
 
413
404
    def test_diff_view(self):
414
405
        tree = self.make_branch_and_tree('tree')
422
413
        dlg = commit.CommitDialog(tree)
423
414
        diff_buffer = dlg._diff_view.buffer
424
415
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
425
 
                                    diff_buffer.get_end_iter(),
426
 
                                    True).splitlines(True)
 
416
                                    diff_buffer.get_end_iter()).splitlines(True)
427
417
 
428
418
        self.assertEqual("=== modified file 'a'\n", text[0])
429
419
        self.assertContainsRe(text[1],
474
464
        self.assertFalse(dlg._file_message_expander.get_expanded())
475
465
        self.assertFalse(dlg._file_message_expander.get_property('sensitive'))
476
466
 
477
 
        dlg._treeview_files.set_cursor(
478
 
            Gtk.TreePath(path=1), None, False)
 
467
        dlg._treeview_files.set_cursor((1,))
479
468
        self.assertEqual('Diff for a', dlg._diff_label.get_text())
480
469
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
481
 
                                    diff_buffer.get_end_iter(),
482
 
                                    True).splitlines(True)
 
470
                                    diff_buffer.get_end_iter()).splitlines(True)
483
471
        self.assertEqual("=== added file 'a'\n", text[0])
484
472
        self.assertContainsRe(text[1],
485
473
            r"--- a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
493
481
        self.assertTrue(dlg._file_message_expander.get_expanded())
494
482
        self.assertTrue(dlg._file_message_expander.get_property('sensitive'))
495
483
 
496
 
        dlg._treeview_files.set_cursor(
497
 
            Gtk.TreePath(path=2), None, False)
 
484
        dlg._treeview_files.set_cursor((2,))
498
485
        self.assertEqual('Diff for b', dlg._diff_label.get_text())
499
486
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
500
 
                                    diff_buffer.get_end_iter(),
501
 
                                    True).splitlines(True)
 
487
                                    diff_buffer.get_end_iter()).splitlines(True)
502
488
        self.assertEqual("=== added file 'b'\n", text[0])
503
489
        self.assertContainsRe(text[1],
504
490
            r"--- b\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
512
498
        self.assertTrue(dlg._file_message_expander.get_expanded())
513
499
        self.assertTrue(dlg._file_message_expander.get_property('sensitive'))
514
500
 
515
 
        dlg._treeview_files.set_cursor(
516
 
            Gtk.TreePath(path=0), None, False)
 
501
        dlg._treeview_files.set_cursor((0,))
517
502
        self.assertEqual('Diff for All Files', dlg._diff_label.get_text())
518
503
        self.assertEqual('File commit message',
519
504
                         dlg._file_message_expander.get_label())
529
514
 
530
515
        def get_file_text():
531
516
            buf = dlg._file_message_text_view.get_buffer()
532
 
            return buf.get_text(
533
 
                buf.get_start_iter(), buf.get_end_iter(), True)
 
517
            return buf.get_text(buf.get_start_iter(), buf.get_end_iter())
534
518
 
535
519
        def get_saved_text(path):
536
520
            """Get the saved text for a given record."""
543
527
        self.assertFalse(dlg._file_message_expander.get_property('sensitive'))
544
528
        self.assertEqual('', get_file_text())
545
529
 
546
 
        dlg._treeview_files.set_cursor(
547
 
            Gtk.TreePath(path=1), None, False)
 
530
        dlg._treeview_files.set_cursor((1,))
548
531
        self.assertEqual('Commit message for a',
549
532
                         dlg._file_message_expander.get_label())
550
533
        self.assertTrue(dlg._file_message_expander.get_expanded())
557
540
        # We should have updated the ListStore with the new file commit info
558
541
        self.assertEqual('Some text\nfor a\n', get_saved_text(1))
559
542
 
560
 
        dlg._treeview_files.set_cursor(
561
 
            Gtk.TreePath(path=2), None, False)
 
543
        dlg._treeview_files.set_cursor((2,))
562
544
        self.assertEqual('Commit message for b/',
563
545
                         dlg._file_message_expander.get_label())
564
546
        self.assertTrue(dlg._file_message_expander.get_expanded())
569
551
        dlg._set_file_commit_message('More text\nfor b\n')
570
552
        # Now switch back to 'a'. The message should be saved, and the buffer
571
553
        # should be updated with the other text
572
 
        dlg._treeview_files.set_cursor(
573
 
            Gtk.TreePath(path=1), None, False)
 
554
        dlg._treeview_files.set_cursor((1,))
574
555
        self.assertEqual('More text\nfor b\n', get_saved_text(2))
575
556
        self.assertEqual('Commit message for a',
576
557
                         dlg._file_message_expander.get_label())
596
577
        #       do with. So instead, we just call toggle directly, and assume
597
578
        #       that toggle is hooked in correctly
598
579
        # column = dlg._treeview_files.get_column(0)
599
 
        # renderer = column.get_cells()[0]
 
580
        # renderer = column.get_cell_renderers()[0]
600
581
 
601
582
        # Toggle a single entry should set just that entry to False
602
583
        dlg._toggle_commit(None, 1, dlg._files_store)
649
630
        dlg._commit_selected_radio.set_active(True)
650
631
        self.assertEqual((['a_file', 'b_dir'], []), dlg._get_specific_files())
651
632
 
652
 
        dlg._treeview_files.set_cursor(
653
 
            Gtk.TreePath(path=1), None, False)
 
633
        dlg._treeview_files.set_cursor((1,))
654
634
        dlg._set_file_commit_message('Test\nmessage\nfor a_file\n')
655
 
        dlg._treeview_files.set_cursor(
656
 
            Gtk.TreePath(path=2), None, False)
 
635
        dlg._treeview_files.set_cursor((2,))
657
636
        dlg._set_file_commit_message('message\nfor b_dir\n')
658
637
 
659
638
        self.assertEqual((['a_file', 'b_dir'],
679
658
        dlg._commit_selected_radio.set_active(True)
680
659
        self.assertEqual((['a_file', 'b_dir'], []), dlg._get_specific_files())
681
660
 
682
 
        dlg._treeview_files.set_cursor(
683
 
            Gtk.TreePath(path=1), None, False)
 
661
        dlg._treeview_files.set_cursor((1,))
684
662
        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)
 
663
        dlg._treeview_files.set_cursor((2,))
687
664
        dlg._set_file_commit_message('message\r\nfor\nb_dir\r')
688
665
 
689
666
        self.assertEqual((['a_file', 'b_dir'],
702
679
        def _question_yes(*args, **kwargs):
703
680
            self.questions.append(args)
704
681
            self.questions.append('YES')
705
 
            return Gtk.ResponseType.YES
 
682
            return gtk.RESPONSE_YES
706
683
        dlg._question_dialog = _question_yes
707
684
 
708
685
    def _set_question_no(self, dlg):
711
688
        def _question_no(*args, **kwargs):
712
689
            self.questions.append(args)
713
690
            self.questions.append('NO')
714
 
            return Gtk.ResponseType.NO
 
691
            return gtk.RESPONSE_NO
715
692
        dlg._question_dialog = _question_no
716
693
 
717
694
 
996
973
 
997
974
        dlg = commit.CommitDialog(tree)
998
975
        dlg._commit_selected_radio.set_active(True) # enable partial
999
 
        dlg._treeview_files.set_cursor(
1000
 
            Gtk.TreePath(path=1), None, False)
 
976
        dlg._treeview_files.set_cursor((1,))
1001
977
        dlg._set_file_commit_message('Message for A\n')
1002
 
        dlg._treeview_files.set_cursor(
1003
 
            Gtk.TreePath(path=2), None, False)
 
978
        dlg._treeview_files.set_cursor((2,))
1004
979
        dlg._set_file_commit_message('Message for B\n')
1005
980
        dlg._toggle_commit(None, 2, dlg._files_store) # unset 'b'
1006
981
        dlg._set_global_commit_message('Commit just "a"')
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')
1057
1031
                         bencode.bdecode(file_info.encode('UTF-8')))
1058
1032
 
1059
1033
    def test_commit_unicode_messages(self):
1060
 
        self.requireFeature(UnicodeFilenameFeature)
 
1034
        self.requireFeature(tests.UnicodeFilenameFeature)
1061
1035
 
1062
1036
        tree = self.make_branch_and_tree('tree')
1063
1037
        tree.branch.get_config().set_user_option('per_file_commits', 'true')
1065
1039
        tree.add(['a', u'\u03a9'], ['a-id', 'omega-id'])
1066
1040
 
1067
1041
        dlg = commit.CommitDialog(tree)
1068
 
        dlg._treeview_files.set_cursor(
1069
 
            Gtk.TreePath(path=1), None, False) # 'a'
 
1042
        dlg._treeview_files.set_cursor((1,)) # 'a'
1070
1043
        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
 
1044
        dlg._treeview_files.set_cursor((2,)) # omega
1073
1045
        dlg._set_file_commit_message(u'\u03a9 is the end of all things.\n')
1074
1046
        dlg._set_global_commit_message(u'\u03a9 and \xfan\xecc\xf6de\n')
1075
1047
 
1131
1103
        super(TestSavedCommitMessages, self).setUp()
1132
1104
        # Install our hook
1133
1105
        branch.Branch.hooks.install_named_hook(
1134
 
            'post_uncommit', commitmsgs.save_commit_messages, None)
 
1106
            'post_uncommit', commit.save_commit_messages, None)
1135
1107
 
1136
1108
    def _get_file_info_dict(self, rank):
1137
1109
        file_info = [dict(path='a', file_id='a-id', message='a msg %d' % rank),