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 278.1.22
- compare with another revision
- download diff
- download tarball
- view history from revision 278.1.22
- Committer: John Arbash Meinel
- Date: 2007-10-02 17:33:27 UTC
- mto: (322.1.1 trunk) (330.3.3 trunk)
- mto: This revision was merged to the branch mainline in revision 368.
- Revision ID: john@arbash-meinel.com-20071002173327-3td5w3r03q4thu5j
Add a test-gtk command to make testing faster
- files added:
- prototype_gcommit.wxg
- files removed:
- branchview
- preferences
- files renamed:
- icons/bzr-icon-64.png => bzr-icon-64.png
- revisionview.py => logview.py
- preferences/__init__.py => preferences.py
- branchview/graphcell.py => viz/graphcell.py
- branchview/linegraph.py => viz/linegraph.py
- branchview/treemodel.py => viz/treemodel.py
- files modified:
- AUTHORS
added
removed
tests/test_commit.py
18
18
19
19
import os
20
20
21
import gtk
22
23
21
from bzrlib import (
24
22
tests,
25
23
revision,
26
24
)
27
from bzrlib.util import bencode
28
25
29
26
from bzrlib.plugins.gtk import commit
30
27
81
78
rev_id1 = tree.commit('one')
82
79
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
83
80
rev_id2 = tree2.commit('two')
81
rev_id3 = tree2.commit('three')
84
82
tree3 = tree2.bzrdir.sprout('tree3').open_workingtree()
85
rev_id3 = tree2.commit('three')
86
83
rev_id4 = tree3.commit('four')
87
84
rev_id5 = tree3.commit('five')
88
85
tree.merge_from_branch(tree2.branch)
183
180
184
181
class TestCommitDialog(tests.TestCaseWithTransport):
185
182
186
def test_bound(self):
187
tree = self.make_branch_and_tree('tree')
188
rev_id = tree.commit('first')
189
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
190
tree2.branch.bind(tree.branch)
191
192
# tree is not a checkout
193
dlg = commit.CommitDialog(tree)
194
self.assertFalse(dlg._check_local.get_property('visible'))
195
196
# tree2 is a checkout
197
dlg2 = commit.CommitDialog(tree2)
198
self.assertTrue(dlg2._check_local.get_property('visible'))
199
200
183
def test_no_pending(self):
201
184
tree = self.make_branch_and_tree('tree')
202
185
rev_id1 = tree.commit('one')
203
186
204
187
dlg = commit.CommitDialog(tree)
205
206
self.assertFalse(dlg._pending_box.get_property('visible'))
207
188
# TODO: assert that the pending box is hidden
208
189
commit_col = dlg._treeview_files.get_column(0)
209
190
self.assertEqual('Commit', commit_col.get_title())
210
191
renderer = commit_col.get_cell_renderers()[0]
211
self.assertTrue(renderer.get_property('activatable'))
212
213
self.assertEqual('Commit all changes',
214
dlg._commit_all_files_radio.get_label())
215
self.assertTrue(dlg._commit_all_files_radio.get_property('sensitive'))
216
self.assertTrue(dlg._commit_selected_radio.get_property('sensitive'))
192
self.assertTrue(renderer.get_active())
217
193
218
194
def test_pending(self):
219
195
tree = self.make_branch_and_tree('tree')
227
203
tree.merge_from_branch(tree2.branch)
228
204
229
205
dlg = commit.CommitDialog(tree)
230
231
self.assertTrue(dlg._pending_box.get_property('visible'))
232
206
# TODO: assert that the pending box is set to show
233
207
commit_col = dlg._treeview_files.get_column(0)
234
208
self.assertEqual('Commit*', commit_col.get_title())
235
209
renderer = commit_col.get_cell_renderers()[0]
236
self.assertFalse(renderer.get_property('activatable'))
210
self.assertFalse(renderer.get_active())
237
211
238
212
values = [(r[0], r[1], r[2], r[3]) for r in dlg._pending_store]
239
213
self.assertEqual([(rev_id2, '2007-10-01', 'Joe Foo', 'two')], values)
240
214
241
self.assertEqual('Commit all changes*',
242
dlg._commit_all_files_radio.get_label())
243
self.assertFalse(dlg._commit_all_files_radio.get_property('sensitive'))
244
self.assertFalse(dlg._commit_selected_radio.get_property('sensitive'))
245
246
215
def test_pending_multiple(self):
247
216
tree = self.make_branch_and_tree('tree')
248
217
rev_id1 = tree.commit('one')
379
348
('a-id', 'a', True, 'a', 'removed'),
380
349
('b-id', 'b', True, 'b/', 'removed'),
381
350
], values)
382
# All Files should be selected
383
self.assertEqual(((0,), None), dlg._treeview_files.get_cursor())
384
385
def test_filelist_with_selected(self):
386
tree = self.make_branch_and_tree('tree')
387
self.build_tree(['tree/a', 'tree/b/'])
388
tree.add(['a', 'b'], ['a-id', 'b-id'])
389
390
dlg = commit.CommitDialog(tree, selected='a')
391
values = [(r[0], r[1], r[2], r[3], r[4]) for r in dlg._files_store]
392
self.assertEqual([(None, None, False, 'All Files', ''),
393
('a-id', 'a', True, 'a', 'added'),
394
('b-id', 'b', False, 'b/', 'added'),
395
], values)
396
# This file should also be selected in the file list, rather than the
397
# 'All Files' selection
398
self.assertEqual(((1,), None), dlg._treeview_files.get_cursor())
399
351
400
352
def test_diff_view(self):
401
353
tree = self.make_branch_and_tree('tree')
411
363
text = diff_buffer.get_text(diff_buffer.get_start_iter(),
412
364
diff_buffer.get_end_iter()).splitlines(True)
413
365
414
self.assertEqual("=== modified file 'a'\n", text[0])
366
self.assertEqual("=== removed file 'b'\n", text[0])
415
367
self.assertContainsRe(text[1],
368
r"--- b\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
369
self.assertEqual('+++ b\t1970-01-01 00:00:00 +0000\n', text[2])
370
self.assertEqual('@@ -1,1 +0,0 @@\n', text[3])
371
self.assertEqual('-contents of tree/b\n', text[4])
372
self.assertEqual('\n', text[5])
373
374
self.assertEqual("=== modified file 'a'\n", text[6])
375
self.assertContainsRe(text[7],
416
376
r"--- a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
417
self.assertContainsRe(text[2],
418
r"\+\+\+ a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
419
self.assertEqual('@@ -1,1 +1,1 @@\n', text[3])
420
self.assertEqual('-contents of tree/a\n', text[4])
421
self.assertEqual('+new contents for a\n', text[5])
422
self.assertEqual('\n', text[6])
423
424
self.assertEqual("=== removed file 'b'\n", text[7])
425
377
self.assertContainsRe(text[8],
426
r"--- b\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
427
self.assertEqual('+++ b\t1970-01-01 00:00:00 +0000\n', text[9])
428
self.assertEqual('@@ -1,1 +0,0 @@\n', text[10])
429
self.assertEqual('-contents of tree/b\n', text[11])
378
r"\+\+\+ a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
379
self.assertEqual('@@ -1,1 +1,1 @@\n', text[9])
380
self.assertEqual('-contents of tree/a\n', text[10])
381
self.assertEqual('+new contents for a\n', text[11])
430
382
self.assertEqual('\n', text[12])
431
383
432
384
self.assertEqual('Diff for All Files', dlg._diff_label.get_text())
433
385
434
def test_commit_partial_toggle(self):
435
tree = self.make_branch_and_tree('tree')
436
self.build_tree(['tree/a', 'tree/b'])
437
tree.add(['a', 'b'], ['a-id', 'b-id'])
438
439
dlg = commit.CommitDialog(tree)
440
checked_col = dlg._treeview_files.get_column(0)
441
self.assertFalse(checked_col.get_property('visible'))
442
self.assertTrue(dlg._commit_all_changes)
443
444
dlg._commit_selected_radio.set_active(True)
445
self.assertTrue(checked_col.get_property('visible'))
446
self.assertFalse(dlg._commit_all_changes)
447
448
386
def test_file_selection(self):
449
387
"""Several things should happen when a file has been selected."""
450
388
tree = self.make_branch_and_tree('tree')
451
tree.branch.get_config().set_user_option('per_file_commits', 'true')
452
389
self.build_tree(['tree/a', 'tree/b'])
453
390
tree.add(['a', 'b'], ['a-id', 'b-id'])
454
391
504
441
def test_file_selection_message(self):
505
442
"""Selecting a file should bring up its commit message."""
506
443
tree = self.make_branch_and_tree('tree')
507
tree.branch.get_config().set_user_option('per_file_commits', 'true')
508
444
self.build_tree(['tree/a', 'tree/b/'])
509
445
tree.add(['a', 'b'], ['a-id', 'b-id'])
510
446
531
467
self.assertEqual('', get_file_text())
532
468
533
469
self.assertEqual('', get_saved_text(1))
534
dlg._set_file_commit_message('Some text\nfor a\n')
470
dlg._file_message_text_view.get_buffer().set_text('Some text\nfor a\n')
535
471
dlg._save_current_file_message()
536
472
# We should have updated the ListStore with the new file commit info
537
473
self.assertEqual('Some text\nfor a\n', get_saved_text(1))
544
480
self.assertEqual('', get_file_text())
545
481
546
482
self.assertEqual('', get_saved_text(2))
547
dlg._set_file_commit_message('More text\nfor b\n')
483
dlg._file_message_text_view.get_buffer().set_text('More text\nfor b\n')
548
484
# Now switch back to 'a'. The message should be saved, and the buffer
549
485
# should be updated with the other text
550
486
dlg._treeview_files.set_cursor((1,))
600
536
('a-id', 'a', True),
601
537
('b-id', 'b', True),
602
538
], [(r[0], r[1], r[2]) for r in dlg._files_store])
603
604
def test_specific_files(self):
605
tree = self.make_branch_and_tree('tree')
606
self.build_tree(['tree/a', 'tree/b/'])
607
tree.add(['a', 'b'], ['a-id', 'b-id'])
608
609
dlg = commit.CommitDialog(tree)
610
self.assertEqual((['a', 'b'], []), dlg._get_specific_files())
611
612
dlg._commit_selected_radio.set_active(True)
613
dlg._toggle_commit(None, 0, dlg._files_store)
614
self.assertEqual(([], []), dlg._get_specific_files())
615
616
dlg._toggle_commit(None, 1, dlg._files_store)
617
self.assertEqual((['a'], []), dlg._get_specific_files())
618
619
def test_specific_files_with_messages(self):
620
tree = self.make_branch_and_tree('tree')
621
tree.branch.get_config().set_user_option('per_file_commits', 'true')
622
self.build_tree(['tree/a_file', 'tree/b_dir/'])
623
tree.add(['a_file', 'b_dir'], ['1a-id', '0b-id'])
624
625
dlg = commit.CommitDialog(tree)
626
dlg._commit_selected_radio.set_active(True)
627
self.assertEqual((['a_file', 'b_dir'], []), dlg._get_specific_files())
628
629
dlg._treeview_files.set_cursor((1,))
630
dlg._set_file_commit_message('Test\nmessage\nfor a_file\n')
631
dlg._treeview_files.set_cursor((2,))
632
dlg._set_file_commit_message('message\nfor b_dir\n')
633
634
self.assertEqual((['a_file', 'b_dir'],
635
[{'path':'a_file', 'file_id':'1a-id',
636
'message':'Test\nmessage\nfor a_file\n'},
637
{'path':'b_dir', 'file_id':'0b-id',
638
'message':'message\nfor b_dir\n'},
639
]), dlg._get_specific_files())
640
641
dlg._toggle_commit(None, 1, dlg._files_store)
642
self.assertEqual((['b_dir'],
643
[{'path':'b_dir', 'file_id':'0b-id',
644
'message':'message\nfor b_dir\n'},
645
]), dlg._get_specific_files())
646
647
648
class TestCommitDialog_Commit(tests.TestCaseWithTransport):
649
"""Tests on the actual 'commit' button being pushed."""
650
651
def _set_question_yes(self, dlg):
652
"""Set the dialog to answer YES to any questions."""
653
self.questions = []
654
def _question_yes(*args):
655
self.questions.append(args)
656
self.questions.append('YES')
657
return gtk.RESPONSE_YES
658
dlg._question_dialog = _question_yes
659
660
def _set_question_no(self, dlg):
661
"""Set the dialog to answer NO to any questions."""
662
self.questions = []
663
def _question_no(*args):
664
self.questions.append(args)
665
self.questions.append('NO')
666
return gtk.RESPONSE_NO
667
dlg._question_dialog = _question_no
668
669
def test_bound_commit_local(self):
670
tree = self.make_branch_and_tree('tree')
671
self.build_tree(['tree/a'])
672
tree.add(['a'], ['a-id'])
673
rev_id1 = tree.commit('one')
674
675
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
676
self.build_tree(['tree2/b'])
677
tree2.add(['b'], ['b-id'])
678
tree2.branch.bind(tree.branch)
679
680
dlg = commit.CommitDialog(tree2)
681
# With the check box set, it should only effect the local branch
682
dlg._check_local.set_active(True)
683
dlg._set_global_commit_message('Commit message\n')
684
dlg._do_commit()
685
686
last_rev = tree2.last_revision()
687
self.assertEqual(last_rev, dlg.committed_revision_id)
688
self.assertEqual(rev_id1, tree.branch.last_revision())
689
690
def test_bound_commit_both(self):
691
tree = self.make_branch_and_tree('tree')
692
self.build_tree(['tree/a'])
693
tree.add(['a'], ['a-id'])
694
rev_id1 = tree.commit('one')
695
696
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
697
self.build_tree(['tree2/b'])
698
tree2.add(['b'], ['b-id'])
699
tree2.branch.bind(tree.branch)
700
701
dlg = commit.CommitDialog(tree2)
702
# With the check box set, it should only effect the local branch
703
dlg._check_local.set_active(False)
704
dlg._set_global_commit_message('Commit message\n')
705
dlg._do_commit()
706
707
last_rev = tree2.last_revision()
708
self.assertEqual(last_rev, dlg.committed_revision_id)
709
self.assertEqual(last_rev, tree.branch.last_revision())
710
711
def test_commit_no_message(self):
712
tree = self.make_branch_and_tree('tree')
713
self.build_tree(['tree/a', 'tree/b'])
714
tree.add(['a'], ['a-id'])
715
rev_id = tree.commit('one')
716
717
tree.add(['b'], ['b-id'])
718
719
dlg = commit.CommitDialog(tree)
720
self._set_question_no(dlg)
721
dlg._do_commit()
722
self.assertEqual(
723
[('Commit with an empty message?',
724
'You can describe your commit intent in the message.'),
725
'NO',
726
], self.questions)
727
# By saying NO, nothing should be committed.
728
self.assertEqual(rev_id, tree.last_revision())
729
self.assertIs(None, dlg.committed_revision_id)
730
self.assertTrue(dlg._global_message_text_view.get_property('is-focus'))
731
732
self._set_question_yes(dlg)
733
734
dlg._do_commit()
735
self.assertEqual(
736
[('Commit with an empty message?',
737
'You can describe your commit intent in the message.'),
738
'YES',
739
], self.questions)
740
committed = tree.last_revision()
741
self.assertNotEqual(rev_id, committed)
742
self.assertEqual(committed, dlg.committed_revision_id)
743
744
def test_initial_commit(self):
745
tree = self.make_branch_and_tree('tree')
746
self.build_tree(['tree/a'])
747
tree.add(['a'], ['a-id'])
748
749
dlg = commit.CommitDialog(tree)
750
dlg._set_global_commit_message('Some text\n')
751
dlg._do_commit()
752
753
last_rev = tree.last_revision()
754
self.assertEqual(last_rev, dlg.committed_revision_id)
755
rev = tree.branch.repository.get_revision(last_rev)
756
self.assertEqual(last_rev, rev.revision_id)
757
self.assertEqual('Some text\n', rev.message)
758
759
def test_pointless_commit(self):
760
tree = self.make_branch_and_tree('tree')
761
self.build_tree(['tree/a'])
762
tree.add(['a'], ['a-id'])
763
rev_id1 = tree.commit('one')
764
765
dlg = commit.CommitDialog(tree)
766
dlg._set_global_commit_message('Some text\n')
767
768
self._set_question_no(dlg)
769
dlg._do_commit()
770
771
self.assertIs(None, dlg.committed_revision_id)
772
self.assertEqual(rev_id1, tree.last_revision())
773
self.assertEqual(
774
[('Commit with no changes?',
775
'There are no changes in the working tree.'
776
' Do you want to commit anyway?'),
777
'NO',
778
], self.questions)
779
780
self._set_question_yes(dlg)
781
dlg._do_commit()
782
783
rev_id2 = tree.last_revision()
784
self.assertEqual(rev_id2, dlg.committed_revision_id)
785
self.assertNotEqual(rev_id1, rev_id2)
786
self.assertEqual(
787
[('Commit with no changes?',
788
'There are no changes in the working tree.'
789
' Do you want to commit anyway?'),
790
'YES',
791
], self.questions)
792
793
def test_unknowns(self):
794
"""We should check if there are unknown files."""
795
tree = self.make_branch_and_tree('tree')
796
rev_id1 = tree.commit('one')
797
self.build_tree(['tree/a', 'tree/b'])
798
tree.add(['a'], ['a-id'])
799
800
dlg = commit.CommitDialog(tree)
801
dlg._set_global_commit_message('Some text\n')
802
self._set_question_no(dlg)
803
804
dlg._do_commit()
805
806
self.assertIs(None, dlg.committed_revision_id)
807
self.assertEqual(rev_id1, tree.last_revision())
808
self.assertEqual(
809
[("Commit with unknowns?",
810
"Unknown files exist in the working tree. Commit anyway?"),
811
"NO",
812
], self.questions)
813
814
self._set_question_yes(dlg)
815
dlg._do_commit()
816
817
rev_id2 = tree.last_revision()
818
self.assertNotEqual(rev_id1, rev_id2)
819
self.assertEqual(rev_id2, dlg.committed_revision_id)
820
self.assertEqual(
821
[("Commit with unknowns?",
822
"Unknown files exist in the working tree. Commit anyway?"),
823
"YES",
824
], self.questions)
825
826
def test_commit_specific_files(self):
827
tree = self.make_branch_and_tree('tree')
828
rev_id1 = tree.commit('one')
829
self.build_tree(['tree/a', 'tree/b'])
830
tree.add(['a', 'b'], ['a-id', 'b-id'])
831
832
dlg = commit.CommitDialog(tree)
833
dlg._commit_selected_radio.set_active(True) # enable partial
834
dlg._toggle_commit(None, 2, dlg._files_store) # unset 'b'
835
836
dlg._set_global_commit_message('Committing just "a"\n')
837
dlg._do_commit()
838
839
rev_id2 = dlg.committed_revision_id
840
self.assertIsNot(None, rev_id2)
841
self.assertEqual(rev_id2, tree.last_revision())
842
843
rt = tree.branch.repository.revision_tree(rev_id2)
844
entries = [(path, ie.file_id) for path, ie in rt.iter_entries_by_dir()
845
if path] # Ignore the root entry
846
self.assertEqual([('a', 'a-id')], entries)
847
848
def test_commit_partial_no_partial(self):
849
"""Ignore the checkboxes if committing all files."""
850
tree = self.make_branch_and_tree('tree')
851
rev_id1 = tree.commit('one')
852
self.build_tree(['tree/a', 'tree/b'])
853
tree.add(['a', 'b'], ['a-id', 'b-id'])
854
855
dlg = commit.CommitDialog(tree)
856
dlg._commit_selected_radio.set_active(True) # enable partial
857
dlg._toggle_commit(None, 2, dlg._files_store) # unset 'b'
858
859
# Switch back to committing all changes
860
dlg._commit_all_files_radio.set_active(True)
861
862
dlg._set_global_commit_message('Committing everything\n')
863
dlg._do_commit()
864
865
rev_id2 = dlg.committed_revision_id
866
self.assertIsNot(None, rev_id2)
867
self.assertEqual(rev_id2, tree.last_revision())
868
869
rt = tree.branch.repository.revision_tree(rev_id2)
870
entries = [(path, ie.file_id) for path, ie in rt.iter_entries_by_dir()
871
if path] # Ignore the root entry
872
self.assertEqual([('a', 'a-id'), ('b', 'b-id')], entries)
873
874
def test_commit_no_messages(self):
875
tree = self.make_branch_and_tree('tree')
876
rev_id1 = tree.commit('one')
877
self.build_tree(['tree/a', 'tree/b'])
878
tree.add(['a', 'b'], ['a-id', 'b-id'])
879
880
dlg = commit.CommitDialog(tree)
881
dlg._set_global_commit_message('Simple commit\n')
882
dlg._do_commit()
883
884
rev = tree.branch.repository.get_revision(dlg.committed_revision_id)
885
self.failIf('file-info' in rev.properties)
886
887
def test_commit_disabled_messages(self):
888
tree = self.make_branch_and_tree('tree')
889
rev_id1 = tree.commit('one')
890
891
self.build_tree(['tree/a', 'tree/b'])
892
tree.add(['a', 'b'], ['a-id', 'b-id'])
893
894
dlg = commit.CommitDialog(tree)
895
self.assertFalse(dlg._file_message_expander.get_property('visible'))
896
self.assertEqual('Commit Message',
897
dlg._global_message_label.get_text())
898
899
tree.branch.get_config().set_user_option('per_file_commits', 'true')
900
dlg = commit.CommitDialog(tree)
901
self.assertTrue(dlg._file_message_expander.get_property('visible'))
902
self.assertEqual('Global Commit Message',
903
dlg._global_message_label.get_text())
904
905
tree.branch.get_config().set_user_option('per_file_commits', 'on')
906
dlg = commit.CommitDialog(tree)
907
self.assertTrue(dlg._file_message_expander.get_property('visible'))
908
self.assertEqual('Global Commit Message',
909
dlg._global_message_label.get_text())
910
911
tree.branch.get_config().set_user_option('per_file_commits', 'y')
912
dlg = commit.CommitDialog(tree)
913
self.assertTrue(dlg._file_message_expander.get_property('visible'))
914
self.assertEqual('Global Commit Message',
915
dlg._global_message_label.get_text())
916
917
tree.branch.get_config().set_user_option('per_file_commits', 'n')
918
dlg = commit.CommitDialog(tree)
919
self.assertFalse(dlg._file_message_expander.get_property('visible'))
920
self.assertEqual('Commit Message',
921
dlg._global_message_label.get_text())
922
923
def test_commit_specific_files_with_messages(self):
924
tree = self.make_branch_and_tree('tree')
925
tree.branch.get_config().set_user_option('per_file_commits', 'true')
926
rev_id1 = tree.commit('one')
927
self.build_tree(['tree/a', 'tree/b'])
928
tree.add(['a', 'b'], ['a-id', 'b-id'])
929
930
dlg = commit.CommitDialog(tree)
931
dlg._commit_selected_radio.set_active(True) # enable partial
932
dlg._treeview_files.set_cursor((1,))
933
dlg._set_file_commit_message('Message for A\n')
934
dlg._treeview_files.set_cursor((2,))
935
dlg._set_file_commit_message('Message for B\n')
936
dlg._toggle_commit(None, 2, dlg._files_store) # unset 'b'
937
dlg._set_global_commit_message('Commit just "a"')
938
939
dlg._do_commit()
940
941
rev_id2 = dlg.committed_revision_id
942
self.assertEqual(rev_id2, tree.last_revision())
943
rev = tree.branch.repository.get_revision(rev_id2)
944
self.assertEqual('Commit just "a"', rev.message)
945
file_info = rev.properties['file-info']
946
self.assertEqual('ld7:file_id4:a-id'
947
'7:message14:Message for A\n'
948
'4:path1:a'
949
'ee', file_info)
950
self.assertEqual([{'path':'a', 'file_id':'a-id',
951
'message':'Message for A\n'},
952
], bencode.bdecode(file_info))
953
954
def test_commit_messages_after_merge(self):
955
tree = self.make_branch_and_tree('tree')
956
tree.branch.get_config().set_user_option('per_file_commits', 'true')
957
rev_id1 = tree.commit('one')
958
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
959
self.build_tree(['tree2/a', 'tree2/b'])
960
tree2.add(['a', 'b'], ['a-id', 'b-id'])
961
rev_id2 = tree2.commit('two')
962
963
tree.merge_from_branch(tree2.branch)
964
965
dlg = commit.CommitDialog(tree)
966
dlg._treeview_files.set_cursor((1,)) # 'a'
967
dlg._set_file_commit_message('Message for A\n')
968
# No message for 'B'
969
dlg._set_global_commit_message('Merging from "tree2"\n')
970
971
dlg._do_commit()
972
973
rev_id3 = dlg.committed_revision_id
974
self.assertEqual(rev_id3, tree.last_revision())
975
rev = tree.branch.repository.get_revision(rev_id3)
976
self.assertEqual('Merging from "tree2"\n', rev.message)
977
self.assertEqual([rev_id1, rev_id2], rev.parent_ids)
978
file_info = rev.properties['file-info']
979
self.assertEqual('ld7:file_id4:a-id'
980
'7:message14:Message for A\n'
981
'4:path1:a'
982
'ee', file_info)
983
self.assertEqual([{'path':'a', 'file_id':'a-id',
984
'message':'Message for A\n'},
985
], bencode.bdecode(file_info))
986
987
def test_commit_unicode_messages(self):
988
self.requireFeature(tests.UnicodeFilenameFeature)
989
990
tree = self.make_branch_and_tree('tree')
991
tree.branch.get_config().set_user_option('per_file_commits', 'true')
992
self.build_tree(['tree/a', u'tree/\u03a9'])
993
tree.add(['a', u'\u03a9'], ['a-id', 'omega-id'])
994
995
dlg = commit.CommitDialog(tree)
996
dlg._treeview_files.set_cursor((1,)) # 'a'
997
dlg._set_file_commit_message(u'Test \xfan\xecc\xf6de\n')
998
dlg._treeview_files.set_cursor((2,)) # omega
999
dlg._set_file_commit_message(u'\u03a9 is the end of all things.\n')
1000
dlg._set_global_commit_message(u'\u03a9 and \xfan\xecc\xf6de\n')
1001
1002
self.assertEqual(([u'a', u'\u03a9'],
1003
[{'path':'a', 'file_id':'a-id',
1004
'message':'Test \xc3\xban\xc3\xacc\xc3\xb6de\n'},
1005
{'path':'\xce\xa9', 'file_id':'omega-id',
1006
'message':'\xce\xa9 is the end of all things.\n'},
1007
]), dlg._get_specific_files())
1008
1009
dlg._do_commit()
1010
1011
rev = tree.branch.repository.get_revision(dlg.committed_revision_id)
1012
file_info = rev.properties['file-info'].encode('UTF-8')
1013
value = ('ld7:file_id4:a-id'
1014
'7:message16:Test \xc3\xban\xc3\xacc\xc3\xb6de\n'
1015
'4:path1:a'
1016
'e'
1017
'd7:file_id8:omega-id'
1018
'7:message29:\xce\xa9 is the end of all things.\n'
1019
'4:path2:\xce\xa9'
1020
'e'
1021
'e')
1022
self.assertEqual(value, file_info)
1023
file_info_decoded = bencode.bdecode(file_info)
1024
for d in file_info_decoded:
1025
d['path'] = d['path'].decode('UTF-8')
1026
d['message'] = d['message'].decode('UTF-8')
1027
1028
self.assertEqual([{'path':u'a', 'file_id':'a-id',
1029
'message':u'Test \xfan\xecc\xf6de\n'},
1030
{'path':u'\u03a9', 'file_id':'omega-id',
1031
'message':u'\u03a9 is the end of all things.\n'},
1032
], file_info_decoded)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0