407
407
def test_file_selection(self):
408
408
"""Several things should happen when a file has been selected."""
409
409
tree = self.make_branch_and_tree('tree')
410
tree.branch.get_config().set_user_option('per_file_commits', 'true')
410
411
self.build_tree(['tree/a', 'tree/b'])
411
412
tree.add(['a', 'b'], ['a-id', 'b-id'])
462
463
def test_file_selection_message(self):
463
464
"""Selecting a file should bring up its commit message."""
464
465
tree = self.make_branch_and_tree('tree')
466
tree.branch.get_config().set_user_option('per_file_commits', 'true')
465
467
self.build_tree(['tree/a', 'tree/b/'])
466
468
tree.add(['a', 'b'], ['a-id', 'b-id'])
575
577
def test_specific_files_with_messages(self):
576
578
tree = self.make_branch_and_tree('tree')
579
tree.branch.get_config().set_user_option('per_file_commits', 'true')
577
580
self.build_tree(['tree/a_file', 'tree/b_dir/'])
578
581
tree.add(['a_file', 'b_dir'], ['1a-id', '0b-id'])
811
814
rev = tree.branch.repository.get_revision(dlg.committed_revision_id)
812
815
self.failIf('file-info' in rev.properties)
817
def test_commit_disabled_messages(self):
818
tree = self.make_branch_and_tree('tree')
819
rev_id1 = tree.commit('one')
821
self.build_tree(['tree/a', 'tree/b'])
822
tree.add(['a', 'b'], ['a-id', 'b-id'])
824
dlg = commit.CommitDialog(tree)
825
self.assertFalse(dlg._file_message_expander.get_property('visible'))
827
tree.branch.get_config().set_user_option('per_file_commits', 'true')
828
dlg = commit.CommitDialog(tree)
829
self.assertTrue(dlg._file_message_expander.get_property('visible'))
831
tree.branch.get_config().set_user_option('per_file_commits', 'on')
832
dlg = commit.CommitDialog(tree)
833
self.assertTrue(dlg._file_message_expander.get_property('visible'))
835
tree.branch.get_config().set_user_option('per_file_commits', 'y')
836
dlg = commit.CommitDialog(tree)
837
self.assertTrue(dlg._file_message_expander.get_property('visible'))
839
tree.branch.get_config().set_user_option('per_file_commits', 'n')
840
dlg = commit.CommitDialog(tree)
841
self.assertFalse(dlg._file_message_expander.get_property('visible'))
814
843
def test_commit_specific_files_with_messages(self):
815
844
tree = self.make_branch_and_tree('tree')
845
tree.branch.get_config().set_user_option('per_file_commits', 'true')
816
846
rev_id1 = tree.commit('one')
817
847
self.build_tree(['tree/a', 'tree/b'])
818
848
tree.add(['a', 'b'], ['a-id', 'b-id'])
843
873
def test_commit_messages_after_merge(self):
844
874
tree = self.make_branch_and_tree('tree')
875
tree.branch.get_config().set_user_option('per_file_commits', 'true')
845
876
rev_id1 = tree.commit('one')
846
877
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
847
878
self.build_tree(['tree2/a', 'tree2/b'])
877
908
self.requireFeature(UnicodeFilename)
879
910
tree = self.make_branch_and_tree('tree')
911
tree.branch.get_config().set_user_option('per_file_commits', 'true')
880
912
self.build_tree(['tree/a', u'tree/\u03a9'])
881
913
tree.add(['a', u'\u03a9'], ['a-id', 'omega-id'])