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 759
- compare with another revision
- download diff
- download tarball
- view history from revision 759
- Committer: Jelmer Vernooij
- Date: 2011-11-30 21:45:54 UTC
- Revision ID: jelmer@samba.org-20111130214554-5kfx0b5y7t5zh033
Extend branch preferences, show location widget.
- files added:
- commitmsgs.py
- files removed:
- keyring.py
- files modified:
- AUTHORS
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
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
211
218
212
219
commit_col = dlg._treeview_files.get_column(0)
213
220
self.assertEqual('Commit', commit_col.get_title())
214
renderer = commit_col.get_cell_renderers()[0]
221
renderer = commit_col.get_cells()[0]
215
222
self.assertTrue(renderer.get_property('activatable'))
216
223
217
224
self.assertEqual('Commit all changes',
236
243
237
244
commit_col = dlg._treeview_files.get_column(0)
238
245
self.assertEqual('Commit*', commit_col.get_title())
239
renderer = commit_col.get_cell_renderers()[0]
246
renderer = commit_col.get_cells()[0]
240
247
self.assertFalse(renderer.get_property('activatable'))
241
248
242
249
values = [(r[0], r[1], r[2], r[3]) for r in dlg._pending_store]
384
391
('b-id', 'b', True, 'b/', 'removed'),
385
392
], values)
386
393
# All Files should be selected
387
self.assertEqual(((0,), None), dlg._treeview_files.get_cursor())
394
self.assertEqual(
395
(Gtk.TreePath(path=0), None), dlg._treeview_files.get_cursor())
388
396
389
397
def test_filelist_with_selected(self):
390
398
tree = self.make_branch_and_tree('tree')
399
407
], values)
400
408
# This file should also be selected in the file list, rather than the
401
409
# 'All Files' selection
402
self.assertEqual(((1,), None), dlg._treeview_files.get_cursor())
410
self.assertEqual(
411
(Gtk.TreePath(path=1), None), dlg._treeview_files.get_cursor())
403
412
404
413
def test_diff_view(self):
405
414
tree = self.make_branch_and_tree('tree')
413
422
dlg = commit.CommitDialog(tree)
414
423
diff_buffer = dlg._diff_view.buffer
415
424
text = diff_buffer.get_text(diff_buffer.get_start_iter(),
416
diff_buffer.get_end_iter()).splitlines(True)
425
diff_buffer.get_end_iter(),
426
True).splitlines(True)
417
427
418
428
self.assertEqual("=== modified file 'a'\n", text[0])
419
429
self.assertContainsRe(text[1],
464
474
self.assertFalse(dlg._file_message_expander.get_expanded())
465
475
self.assertFalse(dlg._file_message_expander.get_property('sensitive'))
466
476
467
dlg._treeview_files.set_cursor((1,))
477
dlg._treeview_files.set_cursor(
478
Gtk.TreePath(path=1), None, False)
468
479
self.assertEqual('Diff for a', dlg._diff_label.get_text())
469
480
text = diff_buffer.get_text(diff_buffer.get_start_iter(),
470
diff_buffer.get_end_iter()).splitlines(True)
481
diff_buffer.get_end_iter(),
482
True).splitlines(True)
471
483
self.assertEqual("=== added file 'a'\n", text[0])
472
484
self.assertContainsRe(text[1],
473
485
r"--- a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
481
493
self.assertTrue(dlg._file_message_expander.get_expanded())
482
494
self.assertTrue(dlg._file_message_expander.get_property('sensitive'))
483
495
484
dlg._treeview_files.set_cursor((2,))
496
dlg._treeview_files.set_cursor(
497
Gtk.TreePath(path=2), None, False)
485
498
self.assertEqual('Diff for b', dlg._diff_label.get_text())
486
499
text = diff_buffer.get_text(diff_buffer.get_start_iter(),
487
diff_buffer.get_end_iter()).splitlines(True)
500
diff_buffer.get_end_iter(),
501
True).splitlines(True)
488
502
self.assertEqual("=== added file 'b'\n", text[0])
489
503
self.assertContainsRe(text[1],
490
504
r"--- b\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
498
512
self.assertTrue(dlg._file_message_expander.get_expanded())
499
513
self.assertTrue(dlg._file_message_expander.get_property('sensitive'))
500
514
501
dlg._treeview_files.set_cursor((0,))
515
dlg._treeview_files.set_cursor(
516
Gtk.TreePath(path=0), None, False)
502
517
self.assertEqual('Diff for All Files', dlg._diff_label.get_text())
503
518
self.assertEqual('File commit message',
504
519
dlg._file_message_expander.get_label())
514
529
515
530
def get_file_text():
516
531
buf = dlg._file_message_text_view.get_buffer()
517
return buf.get_text(buf.get_start_iter(), buf.get_end_iter())
532
return buf.get_text(
533
buf.get_start_iter(), buf.get_end_iter(), True)
518
534
519
535
def get_saved_text(path):
520
536
"""Get the saved text for a given record."""
527
543
self.assertFalse(dlg._file_message_expander.get_property('sensitive'))
528
544
self.assertEqual('', get_file_text())
529
545
530
dlg._treeview_files.set_cursor((1,))
546
dlg._treeview_files.set_cursor(
547
Gtk.TreePath(path=1), None, False)
531
548
self.assertEqual('Commit message for a',
532
549
dlg._file_message_expander.get_label())
533
550
self.assertTrue(dlg._file_message_expander.get_expanded())
540
557
# We should have updated the ListStore with the new file commit info
541
558
self.assertEqual('Some text\nfor a\n', get_saved_text(1))
542
559
543
dlg._treeview_files.set_cursor((2,))
560
dlg._treeview_files.set_cursor(
561
Gtk.TreePath(path=2), None, False)
544
562
self.assertEqual('Commit message for b/',
545
563
dlg._file_message_expander.get_label())
546
564
self.assertTrue(dlg._file_message_expander.get_expanded())
551
569
dlg._set_file_commit_message('More text\nfor b\n')
552
570
# Now switch back to 'a'. The message should be saved, and the buffer
553
571
# should be updated with the other text
554
dlg._treeview_files.set_cursor((1,))
572
dlg._treeview_files.set_cursor(
573
Gtk.TreePath(path=1), None, False)
555
574
self.assertEqual('More text\nfor b\n', get_saved_text(2))
556
575
self.assertEqual('Commit message for a',
557
576
dlg._file_message_expander.get_label())
577
596
# do with. So instead, we just call toggle directly, and assume
578
597
# that toggle is hooked in correctly
579
598
# column = dlg._treeview_files.get_column(0)
580
# renderer = column.get_cell_renderers()[0]
599
# renderer = column.get_cells()[0]
581
600
582
601
# Toggle a single entry should set just that entry to False
583
602
dlg._toggle_commit(None, 1, dlg._files_store)
630
649
dlg._commit_selected_radio.set_active(True)
631
650
self.assertEqual((['a_file', 'b_dir'], []), dlg._get_specific_files())
632
651
633
dlg._treeview_files.set_cursor((1,))
652
dlg._treeview_files.set_cursor(
653
Gtk.TreePath(path=1), None, False)
634
654
dlg._set_file_commit_message('Test\nmessage\nfor a_file\n')
635
dlg._treeview_files.set_cursor((2,))
655
dlg._treeview_files.set_cursor(
656
Gtk.TreePath(path=2), None, False)
636
657
dlg._set_file_commit_message('message\nfor b_dir\n')
637
658
638
659
self.assertEqual((['a_file', 'b_dir'],
658
679
dlg._commit_selected_radio.set_active(True)
659
680
self.assertEqual((['a_file', 'b_dir'], []), dlg._get_specific_files())
660
681
661
dlg._treeview_files.set_cursor((1,))
682
dlg._treeview_files.set_cursor(
683
Gtk.TreePath(path=1), None, False)
662
684
dlg._set_file_commit_message('Test\r\nmessage\rfor a_file\n')
663
dlg._treeview_files.set_cursor((2,))
685
dlg._treeview_files.set_cursor(
686
Gtk.TreePath(path=2), None, False)
664
687
dlg._set_file_commit_message('message\r\nfor\nb_dir\r')
665
688
666
689
self.assertEqual((['a_file', 'b_dir'],
973
996
974
997
dlg = commit.CommitDialog(tree)
975
998
dlg._commit_selected_radio.set_active(True) # enable partial
976
dlg._treeview_files.set_cursor((1,))
999
dlg._treeview_files.set_cursor(
1000
Gtk.TreePath(path=1), None, False)
977
1001
dlg._set_file_commit_message('Message for A\n')
978
dlg._treeview_files.set_cursor((2,))
1002
dlg._treeview_files.set_cursor(
1003
Gtk.TreePath(path=2), None, False)
979
1004
dlg._set_file_commit_message('Message for B\n')
980
1005
dlg._toggle_commit(None, 2, dlg._files_store) # unset 'b'
981
1006
dlg._set_global_commit_message('Commit just "a"')
1008
1033
tree.merge_from_branch(tree2.branch)
1009
1034
1010
1035
dlg = commit.CommitDialog(tree)
1011
dlg._treeview_files.set_cursor((1,)) # 'a'
1036
dlg._treeview_files.set_cursor(
1037
Gtk.TreePath(path=1), None, False) # 'a'
1012
1038
dlg._set_file_commit_message('Message for A\n')
1013
1039
# No message for 'B'
1014
1040
dlg._set_global_commit_message('Merging from "tree2"\n')
1031
1057
bencode.bdecode(file_info.encode('UTF-8')))
1032
1058
1033
1059
def test_commit_unicode_messages(self):
1034
self.requireFeature(tests.UnicodeFilenameFeature)
1060
self.requireFeature(UnicodeFilenameFeature)
1035
1061
1036
1062
tree = self.make_branch_and_tree('tree')
1037
1063
tree.branch.get_config().set_user_option('per_file_commits', 'true')
1039
1065
tree.add(['a', u'\u03a9'], ['a-id', 'omega-id'])
1040
1066
1041
1067
dlg = commit.CommitDialog(tree)
1042
dlg._treeview_files.set_cursor((1,)) # 'a'
1068
dlg._treeview_files.set_cursor(
1069
Gtk.TreePath(path=1), None, False) # 'a'
1043
1070
dlg._set_file_commit_message(u'Test \xfan\xecc\xf6de\n')
1044
dlg._treeview_files.set_cursor((2,)) # omega
1071
dlg._treeview_files.set_cursor(
1072
Gtk.TreePath(path=2), None, False) # omega
1045
1073
dlg._set_file_commit_message(u'\u03a9 is the end of all things.\n')
1046
1074
dlg._set_global_commit_message(u'\u03a9 and \xfan\xecc\xf6de\n')
1047
1075
1103
1131
super(TestSavedCommitMessages, self).setUp()
1104
1132
# Install our hook
1105
1133
branch.Branch.hooks.install_named_hook(
1106
'post_uncommit', commit.save_commit_messages, None)
1134
'post_uncommit', commitmsgs.save_commit_messages, None)
1107
1135
1108
1136
def _get_file_info_dict(self, rank):
1109
1137
file_info = [dict(path='a', file_id='a-id', message='a msg %d' % rank),
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0