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