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