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
- browse files at revision 741
- compare with another revision
- download diff
- download tarball
- view history from revision 741
- Committer: Jelmer Vernooij
- Date: 2011-11-02 11:11:06 UTC
- mfrom: (734.1.55 gtk3)
- Revision ID: jelmer@samba.org-20111102111106-7l0vso8eg24dpf87
Merge gtk3 support from Curtis.
added
removed
tests/test_commit.py
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
211
215
212
216
commit_col = dlg._treeview_files.get_column(0)
213
217
self.assertEqual('Commit', commit_col.get_title())
214
renderer = commit_col.get_cell_renderers()[0]
218
renderer = commit_col.get_cells()[0]
215
219
self.assertTrue(renderer.get_property('activatable'))
216
220
217
221
self.assertEqual('Commit all changes',
236
240
237
241
commit_col = dlg._treeview_files.get_column(0)
238
242
self.assertEqual('Commit*', commit_col.get_title())
239
renderer = commit_col.get_cell_renderers()[0]
243
renderer = commit_col.get_cells()[0]
240
244
self.assertFalse(renderer.get_property('activatable'))
241
245
242
246
values = [(r[0], r[1], r[2], r[3]) for r in dlg._pending_store]
384
388
('b-id', 'b', True, 'b/', 'removed'),
385
389
], values)
386
390
# All Files should be selected
387
self.assertEqual(((0,), None), dlg._treeview_files.get_cursor())
391
self.assertEqual(
392
(Gtk.TreePath(path=0), None), dlg._treeview_files.get_cursor())
388
393
389
394
def test_filelist_with_selected(self):
390
395
tree = self.make_branch_and_tree('tree')
399
404
], values)
400
405
# This file should also be selected in the file list, rather than the
401
406
# 'All Files' selection
402
self.assertEqual(((1,), None), dlg._treeview_files.get_cursor())
407
self.assertEqual(
408
(Gtk.TreePath(path=1), None), dlg._treeview_files.get_cursor())
403
409
404
410
def test_diff_view(self):
405
411
tree = self.make_branch_and_tree('tree')
413
419
dlg = commit.CommitDialog(tree)
414
420
diff_buffer = dlg._diff_view.buffer
415
421
text = diff_buffer.get_text(diff_buffer.get_start_iter(),
416
diff_buffer.get_end_iter()).splitlines(True)
422
diff_buffer.get_end_iter(),
423
True).splitlines(True)
417
424
418
425
self.assertEqual("=== modified file 'a'\n", text[0])
419
426
self.assertContainsRe(text[1],
464
471
self.assertFalse(dlg._file_message_expander.get_expanded())
465
472
self.assertFalse(dlg._file_message_expander.get_property('sensitive'))
466
473
467
dlg._treeview_files.set_cursor((1,))
474
dlg._treeview_files.set_cursor(
475
Gtk.TreePath(path=1), None, False)
468
476
self.assertEqual('Diff for a', dlg._diff_label.get_text())
469
477
text = diff_buffer.get_text(diff_buffer.get_start_iter(),
470
diff_buffer.get_end_iter()).splitlines(True)
478
diff_buffer.get_end_iter(),
479
True).splitlines(True)
471
480
self.assertEqual("=== added file 'a'\n", text[0])
472
481
self.assertContainsRe(text[1],
473
482
r"--- a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
481
490
self.assertTrue(dlg._file_message_expander.get_expanded())
482
491
self.assertTrue(dlg._file_message_expander.get_property('sensitive'))
483
492
484
dlg._treeview_files.set_cursor((2,))
493
dlg._treeview_files.set_cursor(
494
Gtk.TreePath(path=2), None, False)
485
495
self.assertEqual('Diff for b', dlg._diff_label.get_text())
486
496
text = diff_buffer.get_text(diff_buffer.get_start_iter(),
487
diff_buffer.get_end_iter()).splitlines(True)
497
diff_buffer.get_end_iter(),
498
True).splitlines(True)
488
499
self.assertEqual("=== added file 'b'\n", text[0])
489
500
self.assertContainsRe(text[1],
490
501
r"--- b\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
498
509
self.assertTrue(dlg._file_message_expander.get_expanded())
499
510
self.assertTrue(dlg._file_message_expander.get_property('sensitive'))
500
511
501
dlg._treeview_files.set_cursor((0,))
512
dlg._treeview_files.set_cursor(
513
Gtk.TreePath(path=0), None, False)
502
514
self.assertEqual('Diff for All Files', dlg._diff_label.get_text())
503
515
self.assertEqual('File commit message',
504
516
dlg._file_message_expander.get_label())
514
526
515
527
def get_file_text():
516
528
buf = dlg._file_message_text_view.get_buffer()
517
return buf.get_text(buf.get_start_iter(), buf.get_end_iter())
529
return buf.get_text(
530
buf.get_start_iter(), buf.get_end_iter(), True)
518
531
519
532
def get_saved_text(path):
520
533
"""Get the saved text for a given record."""
527
540
self.assertFalse(dlg._file_message_expander.get_property('sensitive'))
528
541
self.assertEqual('', get_file_text())
529
542
530
dlg._treeview_files.set_cursor((1,))
543
dlg._treeview_files.set_cursor(
544
Gtk.TreePath(path=1), None, False)
531
545
self.assertEqual('Commit message for a',
532
546
dlg._file_message_expander.get_label())
533
547
self.assertTrue(dlg._file_message_expander.get_expanded())
540
554
# We should have updated the ListStore with the new file commit info
541
555
self.assertEqual('Some text\nfor a\n', get_saved_text(1))
542
556
543
dlg._treeview_files.set_cursor((2,))
557
dlg._treeview_files.set_cursor(
558
Gtk.TreePath(path=2), None, False)
544
559
self.assertEqual('Commit message for b/',
545
560
dlg._file_message_expander.get_label())
546
561
self.assertTrue(dlg._file_message_expander.get_expanded())
551
566
dlg._set_file_commit_message('More text\nfor b\n')
552
567
# Now switch back to 'a'. The message should be saved, and the buffer
553
568
# should be updated with the other text
554
dlg._treeview_files.set_cursor((1,))
569
dlg._treeview_files.set_cursor(
570
Gtk.TreePath(path=1), None, False)
555
571
self.assertEqual('More text\nfor b\n', get_saved_text(2))
556
572
self.assertEqual('Commit message for a',
557
573
dlg._file_message_expander.get_label())
577
593
# do with. So instead, we just call toggle directly, and assume
578
594
# that toggle is hooked in correctly
579
595
# column = dlg._treeview_files.get_column(0)
580
# renderer = column.get_cell_renderers()[0]
596
# renderer = column.get_cells()[0]
581
597
582
598
# Toggle a single entry should set just that entry to False
583
599
dlg._toggle_commit(None, 1, dlg._files_store)
630
646
dlg._commit_selected_radio.set_active(True)
631
647
self.assertEqual((['a_file', 'b_dir'], []), dlg._get_specific_files())
632
648
633
dlg._treeview_files.set_cursor((1,))
649
dlg._treeview_files.set_cursor(
650
Gtk.TreePath(path=1), None, False)
634
651
dlg._set_file_commit_message('Test\nmessage\nfor a_file\n')
635
dlg._treeview_files.set_cursor((2,))
652
dlg._treeview_files.set_cursor(
653
Gtk.TreePath(path=2), None, False)
636
654
dlg._set_file_commit_message('message\nfor b_dir\n')
637
655
638
656
self.assertEqual((['a_file', 'b_dir'],
658
676
dlg._commit_selected_radio.set_active(True)
659
677
self.assertEqual((['a_file', 'b_dir'], []), dlg._get_specific_files())
660
678
661
dlg._treeview_files.set_cursor((1,))
679
dlg._treeview_files.set_cursor(
680
Gtk.TreePath(path=1), None, False)
662
681
dlg._set_file_commit_message('Test\r\nmessage\rfor a_file\n')
663
dlg._treeview_files.set_cursor((2,))
682
dlg._treeview_files.set_cursor(
683
Gtk.TreePath(path=2), None, False)
664
684
dlg._set_file_commit_message('message\r\nfor\nb_dir\r')
665
685
666
686
self.assertEqual((['a_file', 'b_dir'],
973
993
974
994
dlg = commit.CommitDialog(tree)
975
995
dlg._commit_selected_radio.set_active(True) # enable partial
976
dlg._treeview_files.set_cursor((1,))
996
dlg._treeview_files.set_cursor(
997
Gtk.TreePath(path=1), None, False)
977
998
dlg._set_file_commit_message('Message for A\n')
978
dlg._treeview_files.set_cursor((2,))
999
dlg._treeview_files.set_cursor(
1000
Gtk.TreePath(path=2), None, False)
979
1001
dlg._set_file_commit_message('Message for B\n')
980
1002
dlg._toggle_commit(None, 2, dlg._files_store) # unset 'b'
981
1003
dlg._set_global_commit_message('Commit just "a"')
1008
1030
tree.merge_from_branch(tree2.branch)
1009
1031
1010
1032
dlg = commit.CommitDialog(tree)
1011
dlg._treeview_files.set_cursor((1,)) # 'a'
1033
dlg._treeview_files.set_cursor(
1034
Gtk.TreePath(path=1), None, False) # 'a'
1012
1035
dlg._set_file_commit_message('Message for A\n')
1013
1036
# No message for 'B'
1014
1037
dlg._set_global_commit_message('Merging from "tree2"\n')
1031
1054
bencode.bdecode(file_info.encode('UTF-8')))
1032
1055
1033
1056
def test_commit_unicode_messages(self):
1034
self.requireFeature(tests.UnicodeFilenameFeature)
1057
self.requireFeature(UnicodeFilenameFeature)
1035
1058
1036
1059
tree = self.make_branch_and_tree('tree')
1037
1060
tree.branch.get_config().set_user_option('per_file_commits', 'true')
1039
1062
tree.add(['a', u'\u03a9'], ['a-id', 'omega-id'])
1040
1063
1041
1064
dlg = commit.CommitDialog(tree)
1042
dlg._treeview_files.set_cursor((1,)) # 'a'
1065
dlg._treeview_files.set_cursor(
1066
Gtk.TreePath(path=1), None, False) # 'a'
1043
1067
dlg._set_file_commit_message(u'Test \xfan\xecc\xf6de\n')
1044
dlg._treeview_files.set_cursor((2,)) # omega
1068
dlg._treeview_files.set_cursor(
1069
Gtk.TreePath(path=2), None, False) # omega
1045
1070
dlg._set_file_commit_message(u'\u03a9 is the end of all things.\n')
1046
1071
dlg._set_global_commit_message(u'\u03a9 and \xfan\xecc\xf6de\n')
1047
1072
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0