/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: Mikkel Kamstrup Erlandsen
  • Date: 2011-09-28 07:45:39 UTC
  • mto: This revision was merged to the branch mainline in revision 740.
  • Revision ID: mikkel.kamstrup@gmail.com-20110928074539-qxl1yn1bkjel6ir0
https://launchpad.net/bugs/861201
Add X-GNOME-Autostart-Delay=30 to bzr-notify.desktop

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,
34
34
except ImportError:
35
35
    from bzrlib.util import bencode
36
36
 
37
 
from bzrlib.plugins.gtk import (
38
 
    commit,
39
 
    commitmsgs,
40
 
    )
 
37
from bzrlib.plugins.gtk import commit
41
38
 
42
39
 
43
40
# TODO: All we need is basic ancestry code to test this, we shouldn't need a
49
46
        tree = self.make_branch_and_tree('.')
50
47
        tree.commit('one')
51
48
 
52
 
        self.addCleanup(tree.lock_read().unlock)
53
49
        self.assertIs(None, commit.pending_revisions(tree))
54
50
 
55
51
    def test_pending_revisions_simple(self):
60
56
        tree.merge_from_branch(tree2.branch)
61
57
        self.assertEqual([rev_id1, rev_id2], tree.get_parent_ids())
62
58
 
63
 
        self.addCleanup(tree.lock_read().unlock)
64
59
        pending_revisions = commit.pending_revisions(tree)
65
60
        # One primary merge
66
61
        self.assertEqual(1, len(pending_revisions))
79
74
        tree.merge_from_branch(tree2.branch)
80
75
        self.assertEqual([rev_id1, rev_id4], tree.get_parent_ids())
81
76
 
82
 
        self.addCleanup(tree.lock_read().unlock)
83
77
        pending_revisions = commit.pending_revisions(tree)
84
78
        # One primary merge
85
79
        self.assertEqual(1, len(pending_revisions))
103
97
        tree.merge_from_branch(tree3.branch, force=True)
104
98
        self.assertEqual([rev_id1, rev_id3, rev_id5], tree.get_parent_ids())
105
99
 
106
 
        self.addCleanup(tree.lock_read().unlock)
107
100
        pending_revisions = commit.pending_revisions(tree)
108
101
        # Two primary merges
109
102
        self.assertEqual(2, len(pending_revisions))
222
215
 
223
216
        commit_col = dlg._treeview_files.get_column(0)
224
217
        self.assertEqual('Commit', commit_col.get_title())
225
 
        renderer = commit_col.get_cells()[0]
 
218
        renderer = commit_col.get_cell_renderers()[0]
226
219
        self.assertTrue(renderer.get_property('activatable'))
227
220
 
228
221
        self.assertEqual('Commit all changes',
247
240
 
248
241
        commit_col = dlg._treeview_files.get_column(0)
249
242
        self.assertEqual('Commit*', commit_col.get_title())
250
 
        renderer = commit_col.get_cells()[0]
 
243
        renderer = commit_col.get_cell_renderers()[0]
251
244
        self.assertFalse(renderer.get_property('activatable'))
252
245
 
253
246
        values = [(r[0], r[1], r[2], r[3]) for r in dlg._pending_store]
395
388
                          ('b-id', 'b', True, 'b/', 'removed'),
396
389
                         ], values)
397
390
        # All Files should be selected
398
 
        self.assertEqual(
399
 
            (Gtk.TreePath(path=0), None), dlg._treeview_files.get_cursor())
 
391
        self.assertEqual(((0,), None), dlg._treeview_files.get_cursor())
400
392
 
401
393
    def test_filelist_with_selected(self):
402
394
        tree = self.make_branch_and_tree('tree')
411
403
                         ], values)
412
404
        # This file should also be selected in the file list, rather than the
413
405
        # 'All Files' selection
414
 
        self.assertEqual(
415
 
            (Gtk.TreePath(path=1), None), dlg._treeview_files.get_cursor())
 
406
        self.assertEqual(((1,), None), dlg._treeview_files.get_cursor())
416
407
 
417
408
    def test_diff_view(self):
418
409
        tree = self.make_branch_and_tree('tree')
426
417
        dlg = commit.CommitDialog(tree)
427
418
        diff_buffer = dlg._diff_view.buffer
428
419
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
429
 
                                    diff_buffer.get_end_iter(),
430
 
                                    True).splitlines(True)
 
420
                                    diff_buffer.get_end_iter()).splitlines(True)
431
421
 
432
422
        self.assertEqual("=== modified file 'a'\n", text[0])
433
423
        self.assertContainsRe(text[1],
478
468
        self.assertFalse(dlg._file_message_expander.get_expanded())
479
469
        self.assertFalse(dlg._file_message_expander.get_property('sensitive'))
480
470
 
481
 
        dlg._treeview_files.set_cursor(
482
 
            Gtk.TreePath(path=1), None, False)
 
471
        dlg._treeview_files.set_cursor((1,))
483
472
        self.assertEqual('Diff for a', dlg._diff_label.get_text())
484
473
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
485
 
                                    diff_buffer.get_end_iter(),
486
 
                                    True).splitlines(True)
 
474
                                    diff_buffer.get_end_iter()).splitlines(True)
487
475
        self.assertEqual("=== added file 'a'\n", text[0])
488
476
        self.assertContainsRe(text[1],
489
477
            r"--- a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
497
485
        self.assertTrue(dlg._file_message_expander.get_expanded())
498
486
        self.assertTrue(dlg._file_message_expander.get_property('sensitive'))
499
487
 
500
 
        dlg._treeview_files.set_cursor(
501
 
            Gtk.TreePath(path=2), None, False)
 
488
        dlg._treeview_files.set_cursor((2,))
502
489
        self.assertEqual('Diff for b', dlg._diff_label.get_text())
503
490
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
504
 
                                    diff_buffer.get_end_iter(),
505
 
                                    True).splitlines(True)
 
491
                                    diff_buffer.get_end_iter()).splitlines(True)
506
492
        self.assertEqual("=== added file 'b'\n", text[0])
507
493
        self.assertContainsRe(text[1],
508
494
            r"--- b\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
516
502
        self.assertTrue(dlg._file_message_expander.get_expanded())
517
503
        self.assertTrue(dlg._file_message_expander.get_property('sensitive'))
518
504
 
519
 
        dlg._treeview_files.set_cursor(
520
 
            Gtk.TreePath(path=0), None, False)
 
505
        dlg._treeview_files.set_cursor((0,))
521
506
        self.assertEqual('Diff for All Files', dlg._diff_label.get_text())
522
507
        self.assertEqual('File commit message',
523
508
                         dlg._file_message_expander.get_label())
533
518
 
534
519
        def get_file_text():
535
520
            buf = dlg._file_message_text_view.get_buffer()
536
 
            return buf.get_text(
537
 
                buf.get_start_iter(), buf.get_end_iter(), True)
 
521
            return buf.get_text(buf.get_start_iter(), buf.get_end_iter())
538
522
 
539
523
        def get_saved_text(path):
540
524
            """Get the saved text for a given record."""
547
531
        self.assertFalse(dlg._file_message_expander.get_property('sensitive'))
548
532
        self.assertEqual('', get_file_text())
549
533
 
550
 
        dlg._treeview_files.set_cursor(
551
 
            Gtk.TreePath(path=1), None, False)
 
534
        dlg._treeview_files.set_cursor((1,))
552
535
        self.assertEqual('Commit message for a',
553
536
                         dlg._file_message_expander.get_label())
554
537
        self.assertTrue(dlg._file_message_expander.get_expanded())
561
544
        # We should have updated the ListStore with the new file commit info
562
545
        self.assertEqual('Some text\nfor a\n', get_saved_text(1))
563
546
 
564
 
        dlg._treeview_files.set_cursor(
565
 
            Gtk.TreePath(path=2), None, False)
 
547
        dlg._treeview_files.set_cursor((2,))
566
548
        self.assertEqual('Commit message for b/',
567
549
                         dlg._file_message_expander.get_label())
568
550
        self.assertTrue(dlg._file_message_expander.get_expanded())
573
555
        dlg._set_file_commit_message('More text\nfor b\n')
574
556
        # Now switch back to 'a'. The message should be saved, and the buffer
575
557
        # should be updated with the other text
576
 
        dlg._treeview_files.set_cursor(
577
 
            Gtk.TreePath(path=1), None, False)
 
558
        dlg._treeview_files.set_cursor((1,))
578
559
        self.assertEqual('More text\nfor b\n', get_saved_text(2))
579
560
        self.assertEqual('Commit message for a',
580
561
                         dlg._file_message_expander.get_label())
600
581
        #       do with. So instead, we just call toggle directly, and assume
601
582
        #       that toggle is hooked in correctly
602
583
        # column = dlg._treeview_files.get_column(0)
603
 
        # renderer = column.get_cells()[0]
 
584
        # renderer = column.get_cell_renderers()[0]
604
585
 
605
586
        # Toggle a single entry should set just that entry to False
606
587
        dlg._toggle_commit(None, 1, dlg._files_store)
653
634
        dlg._commit_selected_radio.set_active(True)
654
635
        self.assertEqual((['a_file', 'b_dir'], []), dlg._get_specific_files())
655
636
 
656
 
        dlg._treeview_files.set_cursor(
657
 
            Gtk.TreePath(path=1), None, False)
 
637
        dlg._treeview_files.set_cursor((1,))
658
638
        dlg._set_file_commit_message('Test\nmessage\nfor a_file\n')
659
 
        dlg._treeview_files.set_cursor(
660
 
            Gtk.TreePath(path=2), None, False)
 
639
        dlg._treeview_files.set_cursor((2,))
661
640
        dlg._set_file_commit_message('message\nfor b_dir\n')
662
641
 
663
642
        self.assertEqual((['a_file', 'b_dir'],
683
662
        dlg._commit_selected_radio.set_active(True)
684
663
        self.assertEqual((['a_file', 'b_dir'], []), dlg._get_specific_files())
685
664
 
686
 
        dlg._treeview_files.set_cursor(
687
 
            Gtk.TreePath(path=1), None, False)
 
665
        dlg._treeview_files.set_cursor((1,))
688
666
        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)
 
667
        dlg._treeview_files.set_cursor((2,))
691
668
        dlg._set_file_commit_message('message\r\nfor\nb_dir\r')
692
669
 
693
670
        self.assertEqual((['a_file', 'b_dir'],
706
683
        def _question_yes(*args, **kwargs):
707
684
            self.questions.append(args)
708
685
            self.questions.append('YES')
709
 
            return Gtk.ResponseType.YES
 
686
            return gtk.RESPONSE_YES
710
687
        dlg._question_dialog = _question_yes
711
688
 
712
689
    def _set_question_no(self, dlg):
715
692
        def _question_no(*args, **kwargs):
716
693
            self.questions.append(args)
717
694
            self.questions.append('NO')
718
 
            return Gtk.ResponseType.NO
 
695
            return gtk.RESPONSE_NO
719
696
        dlg._question_dialog = _question_no
720
697
 
721
698
 
1000
977
 
1001
978
        dlg = commit.CommitDialog(tree)
1002
979
        dlg._commit_selected_radio.set_active(True) # enable partial
1003
 
        dlg._treeview_files.set_cursor(
1004
 
            Gtk.TreePath(path=1), None, False)
 
980
        dlg._treeview_files.set_cursor((1,))
1005
981
        dlg._set_file_commit_message('Message for A\n')
1006
 
        dlg._treeview_files.set_cursor(
1007
 
            Gtk.TreePath(path=2), None, False)
 
982
        dlg._treeview_files.set_cursor((2,))
1008
983
        dlg._set_file_commit_message('Message for B\n')
1009
984
        dlg._toggle_commit(None, 2, dlg._files_store) # unset 'b'
1010
985
        dlg._set_global_commit_message('Commit just "a"')
1037
1012
        tree.merge_from_branch(tree2.branch)
1038
1013
 
1039
1014
        dlg = commit.CommitDialog(tree)
1040
 
        dlg._treeview_files.set_cursor(
1041
 
            Gtk.TreePath(path=1), None, False) # 'a'
 
1015
        dlg._treeview_files.set_cursor((1,)) # 'a'
1042
1016
        dlg._set_file_commit_message('Message for A\n')
1043
1017
        # No message for 'B'
1044
1018
        dlg._set_global_commit_message('Merging from "tree2"\n')
1069
1043
        tree.add(['a', u'\u03a9'], ['a-id', 'omega-id'])
1070
1044
 
1071
1045
        dlg = commit.CommitDialog(tree)
1072
 
        dlg._treeview_files.set_cursor(
1073
 
            Gtk.TreePath(path=1), None, False) # 'a'
 
1046
        dlg._treeview_files.set_cursor((1,)) # 'a'
1074
1047
        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
 
1048
        dlg._treeview_files.set_cursor((2,)) # omega
1077
1049
        dlg._set_file_commit_message(u'\u03a9 is the end of all things.\n')
1078
1050
        dlg._set_global_commit_message(u'\u03a9 and \xfan\xecc\xf6de\n')
1079
1051
 
1135
1107
        super(TestSavedCommitMessages, self).setUp()
1136
1108
        # Install our hook
1137
1109
        branch.Branch.hooks.install_named_hook(
1138
 
            'post_uncommit', commitmsgs.save_commit_messages, None)
 
1110
            'post_uncommit', commit.save_commit_messages, None)
1139
1111
 
1140
1112
    def _get_file_info_dict(self, rank):
1141
1113
        file_info = [dict(path='a', file_id='a-id', message='a msg %d' % rank),