/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: John Arbash Meinel
  • Date: 2007-10-02 19:15:41 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-20071002191541-qra1s73obzvgrf7j
Ensure that we can set per-file messages even during a merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_commit.py
839
839
        self.assertEqual([{'path':'a', 'file_id':'a-id',
840
840
                           'message':'Message for A\n'},
841
841
                         ], bencode.bdecode(file_info))
 
842
 
 
843
    def test_commit_messages_after_merge(self):
 
844
        tree = self.make_branch_and_tree('tree')
 
845
        rev_id1 = tree.commit('one')
 
846
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
847
        self.build_tree(['tree2/a', 'tree2/b'])
 
848
        tree2.add(['a', 'b'], ['a-id', 'b-id'])
 
849
        rev_id2 = tree2.commit('two')
 
850
 
 
851
        tree.merge_from_branch(tree2.branch)
 
852
 
 
853
        dlg = commit.CommitDialog(tree)
 
854
        dlg._treeview_files.set_cursor((1,)) # 'a'
 
855
        dlg._set_file_commit_message('Message for A\n')
 
856
        # No message for 'B'
 
857
        dlg._set_global_commit_message('Merging from "tree2"\n')
 
858
 
 
859
        dlg._do_commit()
 
860
 
 
861
        rev_id3 = dlg.committed_revision_id
 
862
        self.assertEqual(rev_id3, tree.last_revision())
 
863
        rev = tree.branch.repository.get_revision(rev_id3)
 
864
        self.assertEqual('Merging from "tree2"\n', rev.message)
 
865
        self.assertEqual([rev_id1, rev_id2], rev.parent_ids)
 
866
        file_info = rev.properties['file-info']
 
867
        self.assertEqual('ld7:file_id4:a-id'
 
868
                           '7:message14:Message for A\n'
 
869
                           '4:path1:a'
 
870
                         'ee', file_info)
 
871
        self.assertEqual([{'path':'a', 'file_id':'a-id',
 
872
                           'message':'Message for A\n'},
 
873
                         ], bencode.bdecode(file_info))