/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-20 16:16:57 UTC
  • Revision ID: jelmer@canonical.com-20111220161657-zjn6rqjrw8ouehf8
Drop support for old bencode location.

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