← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_branchbuilder.py

  • Committer: Martin
  • Date: 2010-05-16 15:18:43 UTC
  • mfrom: (5235 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5239.
  • Revision ID: gzlist@googlemail.com-20100516151843-lu53u7caehm3ie3i
Merge bzr.dev to resolve conflicts in NEWS and _chk_map_pyx

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_branchbuilder.py
171
171
        rev = branch.repository.get_revision(rev_id)
172
172
        self.assertEqual(u'Foo', rev.message)
173
173
 
 
174
    def test_commit_message_callback(self):
 
175
        builder = BranchBuilder(self.get_transport().clone('foo'))
 
176
        rev_id = builder.build_snapshot(None, None,
 
177
            [('add', (u'', None, 'directory', None))],
 
178
            message_callback=lambda x:u'Foo')
 
179
        branch = builder.get_branch()
 
180
        rev = branch.repository.get_revision(rev_id)
 
181
        self.assertEqual(u'Foo', rev.message)
 
182
 
174
183
    def test_modify_file(self):
175
184
        builder = self.build_a_rev()
176
185
        rev_id2 = builder.build_snapshot('B-id', None,
326
335
            builder.finish_series()
327
336
        self.assertIs(None, builder._tree)
328
337
        self.assertFalse(builder._branch.is_locked())
 
338
 
 
339
    def test_ghost_mainline_history(self):
 
340
        builder = BranchBuilder(self.get_transport().clone('foo'))
 
341
        builder.start_series()
 
342
        try:
 
343
            builder.build_snapshot('tip', ['ghost'],
 
344
                [('add', ('', 'ROOT_ID', 'directory', ''))],
 
345
                allow_leftmost_as_ghost=True)
 
346
        finally:
 
347
            builder.finish_series()
 
348
        b = builder.get_branch()
 
349
        b.lock_read()
 
350
        self.addCleanup(b.unlock)
 
351
        self.assertEqual(('ghost',),
 
352
            b.repository.get_graph().get_parent_map(['tip'])['tip'])