~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_branchbuilder.py

(gz) Backslash escape selftest output when printing to non-unicode consoles
 (Martin [gz])

Show diffs side-by-side

added added

removed removed

Lines of Context:
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,
315
324
        # should look like it was not modified in the merge
316
325
        self.assertEqual('C-id', d_tree.inventory['c-id'].revision)
317
326
 
 
327
    def test_set_parent_to_null(self):
 
328
        builder = self.build_a_rev()
 
329
        builder.start_series()
 
330
        self.addCleanup(builder.finish_series)
 
331
        builder.build_snapshot('B-id', [],
 
332
            [('add', ('', None, 'directory', None))])
 
333
        # We should now have a graph:
 
334
        #   A B
 
335
        # And not A => B
 
336
        repo = builder.get_branch().repository
 
337
        self.assertEqual({'A-id': (_mod_revision.NULL_REVISION,),
 
338
                          'B-id': (_mod_revision.NULL_REVISION,),},
 
339
                         repo.get_parent_map(['A-id', 'B-id']))
 
340
 
 
341
    
318
342
    def test_start_finish_series(self):
319
343
        builder = BranchBuilder(self.get_transport().clone('foo'))
320
344
        builder.start_series()