← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

Merge with annotate

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
2224
2224
        summary = preview.get_preview_tree().path_content_summary('path')
2225
2225
        self.assertEqual(4, len(summary))
2226
2226
        self.assertEqual('tree-reference', summary[0])
 
2227
 
 
2228
    def test_annotate(self):
 
2229
        tree = self.make_branch_and_tree('tree')
 
2230
        self.build_tree_contents([('tree/file', 'a\n')])
 
2231
        tree.add('file', 'file-id')
 
2232
        tree.commit('a', rev_id='one')
 
2233
        self.build_tree_contents([('tree/file', 'a\nb\n')])
 
2234
        preview = TransformPreview(tree)
 
2235
        self.addCleanup(preview.finalize)
 
2236
        file_trans_id = preview.trans_id_file_id('file-id')
 
2237
        preview.delete_contents(file_trans_id)
 
2238
        preview.create_file('a\nb\nc\n', file_trans_id)
 
2239
        preview_tree = preview.get_preview_tree()
 
2240
        expected = [
 
2241
            ('one', 'a\n'),
 
2242
            ('me:', 'b\n'),
 
2243
            ('me:', 'c\n'),
 
2244
        ]
 
2245
        annotation = preview_tree.annotate_iter('file-id', 'me:')
 
2246
        self.assertEqual(expected, annotation)
 
2247
 
 
2248
    def test_annotate_missing(self):
 
2249
        preview = self.get_empty_preview()
 
2250
        preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
 
2251
        preview_tree = preview.get_preview_tree()
 
2252
        expected = [
 
2253
            ('me:', 'a\n'),
 
2254
            ('me:', 'b\n'),
 
2255
            ('me:', 'c\n'),
 
2256
         ]
 
2257
        annotation = preview_tree.annotate_iter('file-id', 'me:')
 
2258
        self.assertEqual(expected, annotation)
 
2259
 
 
2260
    def test_annotate_deleted(self):
 
2261
        tree = self.make_branch_and_tree('tree')
 
2262
        self.build_tree_contents([('tree/file', 'a\n')])
 
2263
        tree.add('file', 'file-id')
 
2264
        tree.commit('a', rev_id='one')
 
2265
        self.build_tree_contents([('tree/file', 'a\nb\n')])
 
2266
        preview = TransformPreview(tree)
 
2267
        self.addCleanup(preview.finalize)
 
2268
        file_trans_id = preview.trans_id_file_id('file-id')
 
2269
        preview.delete_contents(file_trans_id)
 
2270
        preview_tree = preview.get_preview_tree()
 
2271
        annotation = preview_tree.annotate_iter('file-id', 'me:')
 
2272
        self.assertIs(None, annotation)
 
2273