/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-02-18 13:01:03 UTC
  • Revision ID: jelmer@samba.org-20110218130103-fiyk203auk28thpn
Remove some unused imports, fix some formatting.

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