/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_annotate.py

  • Committer: Jelmer Vernooij
  • Date: 2018-02-18 21:42:57 UTC
  • mto: This revision was merged to the branch mainline in revision 6859.
  • Revision ID: jelmer@jelmer.uk-20180218214257-jpevutp1wa30tz3v
Update TODO to reference Breezy, not Bazaar.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_annotate.py
17
17
"""Whitebox tests for annotate functionality."""
18
18
 
19
19
import codecs
20
 
from io import BytesIO, StringIO
21
20
 
22
21
from .. import (
23
22
    annotate,
24
23
    tests,
25
24
    )
 
25
from ..sixish import (
 
26
    BytesIO,
 
27
    )
26
28
from .ui_testing import StringIOWithEncoding
27
29
 
28
30
 
29
31
def annotation(text):
30
 
    return [tuple(l.split(b' ', 1)) for l in text.splitlines(True)]
31
 
 
32
 
 
33
 
parent_1 = annotation(b"""\
 
32
    return [tuple(l.split(' ', 1)) for l in text.splitlines(True)]
 
33
 
 
34
 
 
35
parent_1 = annotation("""\
34
36
rev1 a
35
37
rev2 b
36
38
rev3 c
39
41
""")
40
42
 
41
43
 
42
 
parent_2 = annotation(b"""\
 
44
parent_2 = annotation("""\
43
45
rev1 a
44
46
rev3 c
45
47
rev4 d
49
51
""")
50
52
 
51
53
 
52
 
expected_2_1 = annotation(b"""\
 
54
expected_2_1 = annotation("""\
53
55
rev1 a
54
56
blahblah b
55
57
rev3 c
66
68
# f: in 2, but not in new, so ignored
67
69
# g: not in 1 or 2, so it goes to blahblah
68
70
# h: only in parent 2, so 2 gets it
69
 
expected_1_2_2 = annotation(b"""\
 
71
expected_1_2_2 = annotation("""\
70
72
rev1 a
71
73
rev2 b
72
74
rev3 c
77
79
""")
78
80
 
79
81
 
80
 
new_1 = b"""\
 
82
new_1 = """\
81
83
a
82
84
b
83
85
c
85
87
e
86
88
""".splitlines(True)
87
89
 
88
 
expected_1 = annotation(b"""\
 
90
expected_1 = annotation("""\
89
91
blahblah a
90
92
blahblah b
91
93
blahblah c
94
96
""")
95
97
 
96
98
 
97
 
new_2 = b"""\
 
99
new_2 = """\
98
100
a
99
101
b
100
102
c
118
120
#  |/
119
121
#  E    # D should supersede A and stay as D (not become E because C references
120
122
#         A)
121
 
duplicate_base = annotation(b"""\
 
123
duplicate_base = annotation("""\
122
124
rev-base first
123
125
rev-base second
124
126
rev-base third
125
127
rev-base fourth-base
126
128
""")
127
129
 
128
 
duplicate_A = annotation(b"""\
 
130
duplicate_A = annotation("""\
129
131
rev-base first
130
132
rev-A alt-second
131
133
rev-base third
132
134
rev-A fourth-A
133
135
""")
134
136
 
135
 
duplicate_B = annotation(b"""\
 
137
duplicate_B = annotation("""\
136
138
rev-base first
137
139
rev-B alt-second
138
140
rev-base third
139
141
rev-B fourth-B
140
142
""")
141
143
 
142
 
duplicate_C = annotation(b"""\
 
144
duplicate_C = annotation("""\
143
145
rev-base first
144
146
rev-A alt-second
145
147
rev-base third
146
148
rev-C fourth-C
147
149
""")
148
150
 
149
 
duplicate_D = annotation(b"""\
 
151
duplicate_D = annotation("""\
150
152
rev-base first
151
153
rev-A alt-second
152
154
rev-base third
153
155
rev-D fourth-D
154
156
""")
155
157
 
156
 
duplicate_E = annotation(b"""\
 
158
duplicate_E = annotation("""\
157
159
rev-base first
158
160
rev-A alt-second
159
161
rev-base third
178
180
        builder.start_series()
179
181
        self.addCleanup(builder.finish_series)
180
182
        builder.build_snapshot(None, [
181
 
            ('add', ('', b'root-id', 'directory', None)),
182
 
            ('add', ('a', b'a-id', 'file', b'first\n')),
 
183
            ('add', ('', 'root-id', 'directory', None)),
 
184
            ('add', ('a', 'a-id', 'file', 'first\n')),
183
185
            ], timestamp=1166046000.00, timezone=0, committer="joe@foo.com",
184
 
            revision_id=b'rev-1')
185
 
        builder.build_snapshot([b'rev-1'], [
186
 
            ('modify', ('a', b'first\nsecond\n')),
 
186
            revision_id='rev-1')
 
187
        builder.build_snapshot(['rev-1'], [
 
188
            ('modify', ('a-id', 'first\nsecond\n')),
187
189
            ], timestamp=1166046001.00, timezone=0, committer="joe@foo.com",
188
 
            revision_id=b'rev-2')
189
 
        builder.build_snapshot([b'rev-1'], [
190
 
            ('modify', ('a', b'first\nthird\n')),
 
190
            revision_id='rev-2')
 
191
        builder.build_snapshot(['rev-1'], [
 
192
            ('modify', ('a-id', 'first\nthird\n')),
191
193
            ], timestamp=1166046002.00, timezone=0, committer="barry@foo.com",
192
 
            revision_id=b'rev-1_1_1')
193
 
        builder.build_snapshot([b'rev-2', b'rev-1_1_1'], [
194
 
            ('modify', ('a', b'first\nsecond\nthird\n')),
 
194
            revision_id='rev-1_1_1')
 
195
        builder.build_snapshot(['rev-2', 'rev-1_1_1'], [
 
196
            ('modify', ('a-id', 'first\nsecond\nthird\n')),
195
197
            ], timestamp=1166046003.00, timezone=0, committer="sal@foo.com",
196
 
            revision_id=b'rev-3')
 
198
            revision_id='rev-3')
197
199
        return builder
198
200
 
199
201
    def create_deeply_merged_trees(self):
220
222
        rev-6
221
223
        """
222
224
        builder = self.create_merged_trees()
223
 
        builder.build_snapshot([b'rev-1_1_1'], [], revision_id=b'rev-1_1_2')
224
 
        builder.build_snapshot([b'rev-3', b'rev-1_1_2'],
225
 
                               [], revision_id=b'rev-4')
226
 
        builder.build_snapshot([b'rev-1_1_1'], [
227
 
            ('modify', ('a', b'first\nthird\nfourth\n')),
 
225
        builder.build_snapshot(['rev-1_1_1'], [], revision_id='rev-1_1_2')
 
226
        builder.build_snapshot(['rev-3', 'rev-1_1_2'], [], revision_id='rev-4')
 
227
        builder.build_snapshot(['rev-1_1_1'], [
 
228
            ('modify', ('a-id', 'first\nthird\nfourth\n')),
228
229
            ], timestamp=1166046003.00, timezone=0, committer="jerry@foo.com",
229
 
            revision_id=b'rev-1_2_1')
230
 
        builder.build_snapshot([b'rev-1_2_1'], [],
231
 
                               timestamp=1166046004.00, timezone=0, committer="jerry@foo.com",
232
 
                               revision_id=b'rev-1_2_2')
233
 
        builder.build_snapshot([b'rev-4', b'rev-1_2_2'], [
234
 
            ('modify', ('a', b'first\nsecond\nthird\nfourth\n')),
 
230
            revision_id='rev-1_2_1')
 
231
        builder.build_snapshot(['rev-1_2_1'], [],
 
232
            timestamp=1166046004.00, timezone=0, committer="jerry@foo.com",
 
233
            revision_id='rev-1_2_2')
 
234
        builder.build_snapshot(['rev-4', 'rev-1_2_2'], [
 
235
            ('modify', ('a-id', 'first\nsecond\nthird\nfourth\n')),
235
236
            ], timestamp=1166046004.00, timezone=0, committer="jerry@foo.com",
236
 
            revision_id=b'rev-5')
237
 
        builder.build_snapshot([b'rev-1_2_1'], [
238
 
            ('modify', ('a', b'first\nthird\nfourth\nfifth\nsixth\n')),
 
237
            revision_id='rev-5')
 
238
        builder.build_snapshot(['rev-1_2_1'], [
 
239
            ('modify', ('a-id', 'first\nthird\nfourth\nfifth\nsixth\n')),
239
240
            ], timestamp=1166046005.00, timezone=0, committer="george@foo.com",
240
 
            revision_id=b'rev-1_3_1')
241
 
        builder.build_snapshot([b'rev-5', b'rev-1_3_1'], [
242
 
            ('modify', ('a',
243
 
                        b'first\nsecond\nthird\nfourth\nfifth\nsixth\n')),
244
 
            ], revision_id=b'rev-6')
 
241
            revision_id='rev-1_3_1')
 
242
        builder.build_snapshot(['rev-5', 'rev-1_3_1'], [
 
243
            ('modify', ('a-id',
 
244
                        'first\nsecond\nthird\nfourth\nfifth\nsixth\n')),
 
245
            ], revision_id='rev-6')
245
246
        return builder
246
247
 
247
248
    def create_duplicate_lines_tree(self):
248
249
        builder = self.make_branch_builder('branch')
249
250
        builder.start_series()
250
251
        self.addCleanup(builder.finish_series)
251
 
        base_text = b''.join(l for r, l in duplicate_base)
252
 
        a_text = b''.join(l for r, l in duplicate_A)
253
 
        b_text = b''.join(l for r, l in duplicate_B)
254
 
        c_text = b''.join(l for r, l in duplicate_C)
255
 
        d_text = b''.join(l for r, l in duplicate_D)
256
 
        e_text = b''.join(l for r, l in duplicate_E)
 
252
        base_text = ''.join(l for r, l in duplicate_base)
 
253
        a_text = ''.join(l for r, l in duplicate_A)
 
254
        b_text = ''.join(l for r, l in duplicate_B)
 
255
        c_text = ''.join(l for r, l in duplicate_C)
 
256
        d_text = ''.join(l for r, l in duplicate_D)
 
257
        e_text = ''.join(l for r, l in duplicate_E)
257
258
        builder.build_snapshot(None, [
258
 
            ('add', ('', b'root-id', 'directory', None)),
259
 
            ('add', ('file', b'file-id', 'file', base_text)),
260
 
            ], revision_id=b'rev-base')
261
 
        builder.build_snapshot([b'rev-base'], [
262
 
            ('modify', ('file', a_text))],
263
 
            revision_id=b'rev-A')
264
 
        builder.build_snapshot([b'rev-base'], [
265
 
            ('modify', ('file', b_text))],
266
 
            revision_id=b'rev-B')
267
 
        builder.build_snapshot([b'rev-A'], [
268
 
            ('modify', ('file', c_text))],
269
 
            revision_id=b'rev-C')
270
 
        builder.build_snapshot([b'rev-B', b'rev-A'], [
271
 
            ('modify', ('file', d_text))],
272
 
            revision_id=b'rev-D')
273
 
        builder.build_snapshot([b'rev-C', b'rev-D'], [
274
 
            ('modify', ('file', e_text))],
275
 
            revision_id=b'rev-E')
 
259
            ('add', ('', 'root-id', 'directory', None)),
 
260
            ('add', ('file', 'file-id', 'file', base_text)),
 
261
            ], revision_id='rev-base')
 
262
        builder.build_snapshot(['rev-base'], [
 
263
            ('modify', ('file-id', a_text))],
 
264
            revision_id='rev-A')
 
265
        builder.build_snapshot(['rev-base'], [
 
266
            ('modify', ('file-id', b_text))],
 
267
            revision_id='rev-B')
 
268
        builder.build_snapshot(['rev-A'], [
 
269
            ('modify', ('file-id', c_text))],
 
270
            revision_id='rev-C')
 
271
        builder.build_snapshot(['rev-B', 'rev-A'], [
 
272
            ('modify', ('file-id', d_text))],
 
273
            revision_id='rev-D')
 
274
        builder.build_snapshot(['rev-C', 'rev-D'], [
 
275
            ('modify', ('file-id', e_text))],
 
276
            revision_id='rev-E')
276
277
        return builder
277
278
 
278
279
    def assertAnnotateEqualDiff(self, actual, expected):
283
284
                                 ''.join('\t'.join(l) for l in actual))
284
285
 
285
286
    def assertBranchAnnotate(self, expected, branch, path, revision_id,
286
 
                             verbose=False, full=False, show_ids=False):
 
287
            verbose=False, full=False, show_ids=False):
287
288
        tree = branch.repository.revision_tree(revision_id)
288
 
        to_file = StringIO()
 
289
        to_file = BytesIO()
289
290
        annotate.annotate_file_tree(tree, path, to_file,
290
 
                                    verbose=verbose, full=full, show_ids=show_ids, branch=branch)
 
291
            verbose=verbose, full=full, show_ids=show_ids, branch=branch)
291
292
        self.assertAnnotateEqualDiff(to_file.getvalue(), expected)
292
293
 
293
294
    def assertRepoAnnotate(self, expected, repo, path, revision_id):
301
302
        repo = builder.get_branch().repository
302
303
        repo.lock_read()
303
304
        self.addCleanup(repo.unlock)
304
 
        self.assertRepoAnnotate(duplicate_base, repo, 'file', b'rev-base')
305
 
        self.assertRepoAnnotate(duplicate_A, repo, 'file', b'rev-A')
306
 
        self.assertRepoAnnotate(duplicate_B, repo, 'file', b'rev-B')
307
 
        self.assertRepoAnnotate(duplicate_C, repo, 'file', b'rev-C')
308
 
        self.assertRepoAnnotate(duplicate_D, repo, 'file', b'rev-D')
309
 
        self.assertRepoAnnotate(duplicate_E, repo, 'file', b'rev-E')
 
305
        self.assertRepoAnnotate(duplicate_base, repo, 'file', 'rev-base')
 
306
        self.assertRepoAnnotate(duplicate_A, repo, 'file', 'rev-A')
 
307
        self.assertRepoAnnotate(duplicate_B, repo, 'file', 'rev-B')
 
308
        self.assertRepoAnnotate(duplicate_C, repo, 'file', 'rev-C')
 
309
        self.assertRepoAnnotate(duplicate_D, repo, 'file', 'rev-D')
 
310
        self.assertRepoAnnotate(duplicate_E, repo, 'file', 'rev-E')
310
311
 
311
312
    def test_annotate_shows_dotted_revnos(self):
312
313
        builder = self.create_merged_trees()
314
315
        self.assertBranchAnnotate('1     joe@foo | first\n'
315
316
                                  '2     joe@foo | second\n'
316
317
                                  '1.1.1 barry@f | third\n',
317
 
                                  builder.get_branch(), 'a', b'rev-3')
 
318
                                  builder.get_branch(), 'a', 'rev-3')
318
319
 
319
320
    def test_annotate_limits_dotted_revnos(self):
320
321
        """Annotate should limit dotted revnos to a depth of 12"""
326
327
                                  '1.2.1 jerry@f | fourth\n'
327
328
                                  '1.3.1 george@ | fifth\n'
328
329
                                  '              | sixth\n',
329
 
                                  builder.get_branch(), 'a', b'rev-6',
 
330
                                  builder.get_branch(), 'a', 'rev-6',
330
331
                                  verbose=False, full=False)
331
332
 
332
333
        self.assertBranchAnnotate('1     joe@foo | first\n'
335
336
                                  '1.2.1 jerry@f | fourth\n'
336
337
                                  '1.3.1 george@ | fifth\n'
337
338
                                  '1.3.1 george@ | sixth\n',
338
 
                                  builder.get_branch(), 'a', b'rev-6',
 
339
                                  builder.get_branch(), 'a', 'rev-6',
339
340
                                  verbose=False, full=True)
340
341
 
341
342
        # verbose=True shows everything, the full revno, user id, and date
345
346
                                  '1.2.1 jerry@foo.com  20061213 | fourth\n'
346
347
                                  '1.3.1 george@foo.com 20061213 | fifth\n'
347
348
                                  '                              | sixth\n',
348
 
                                  builder.get_branch(), 'a', b'rev-6',
 
349
                                  builder.get_branch(), 'a', 'rev-6',
349
350
                                  verbose=True, full=False)
350
351
 
351
352
        self.assertBranchAnnotate('1     joe@foo.com    20061213 | first\n'
354
355
                                  '1.2.1 jerry@foo.com  20061213 | fourth\n'
355
356
                                  '1.3.1 george@foo.com 20061213 | fifth\n'
356
357
                                  '1.3.1 george@foo.com 20061213 | sixth\n',
357
 
                                  builder.get_branch(), 'a', b'rev-6',
 
358
                                  builder.get_branch(), 'a', 'rev-6',
358
359
                                  verbose=True, full=True)
359
360
 
360
361
    def test_annotate_uses_branch_context(self):
370
371
                                  '1.2.1 jerry@f | fourth\n'
371
372
                                  '1.3.1 george@ | fifth\n'
372
373
                                  '              | sixth\n',
373
 
                                  builder.get_branch(), 'a', b'rev-1_3_1',
 
374
                                  builder.get_branch(), 'a', 'rev-1_3_1',
374
375
                                  verbose=False, full=False)
375
376
 
376
377
    def test_annotate_show_ids(self):
383
384
                                  'rev-1_2_1 | fourth\n'
384
385
                                  'rev-1_3_1 | fifth\n'
385
386
                                  '          | sixth\n',
386
 
                                  builder.get_branch(), 'a', b'rev-6',
 
387
                                  builder.get_branch(), 'a', 'rev-6',
387
388
                                  show_ids=True, full=False)
388
389
 
389
390
        self.assertBranchAnnotate('    rev-1 | first\n'
392
393
                                  'rev-1_2_1 | fourth\n'
393
394
                                  'rev-1_3_1 | fifth\n'
394
395
                                  'rev-1_3_1 | sixth\n',
395
 
                                  builder.get_branch(), 'a', b'rev-6',
 
396
                                  builder.get_branch(), 'a', 'rev-6',
396
397
                                  show_ids=True, full=True)
397
398
 
398
399
    def test_annotate_unicode_author(self):
399
400
        tree1 = self.make_branch_and_tree('tree1')
400
401
 
401
 
        self.build_tree_contents([('tree1/a', b'adi\xc3\xb3s')])
402
 
        tree1.add(['a'], [b'a-id'])
403
 
        tree1.commit('a', rev_id=b'rev-1',
 
402
        self.build_tree_contents([('tree1/a', 'adi\xc3\xb3s')])
 
403
        tree1.add(['a'], ['a-id'])
 
404
        tree1.commit('a', rev_id='rev-1',
404
405
                     committer=u'Pepe P\xe9rez <pperez@ejemplo.com>',
405
406
                     timestamp=1166046000.00, timezone=0)
406
407
 
407
 
        self.build_tree_contents([('tree1/b', b'bye')])
408
 
        tree1.add(['b'], [b'b-id'])
409
 
        tree1.commit('b', rev_id=b'rev-2',
 
408
        self.build_tree_contents([('tree1/b', 'bye')])
 
409
        tree1.add(['b'], ['b-id'])
 
410
        tree1.commit('b', rev_id='rev-2',
410
411
                     committer=u'p\xe9rez',
411
412
                     timestamp=1166046000.00, timezone=0)
412
413
 
413
414
        tree1.lock_read()
414
415
        self.addCleanup(tree1.unlock)
415
416
 
416
 
        revtree_1 = tree1.branch.repository.revision_tree(b'rev-1')
417
 
        revtree_2 = tree1.branch.repository.revision_tree(b'rev-2')
 
417
        revtree_1 = tree1.branch.repository.revision_tree('rev-1')
 
418
        revtree_2 = tree1.branch.repository.revision_tree('rev-2')
418
419
 
419
420
        # this passes if no exception is raised
420
 
        to_file = StringIO()
 
421
        to_file = BytesIO()
421
422
        annotate.annotate_file_tree(revtree_1, 'a',
422
 
                                    to_file=to_file, branch=tree1.branch)
 
423
            to_file=to_file, branch=tree1.branch)
423
424
 
424
425
        sio = BytesIO()
425
426
        to_file = codecs.getwriter('ascii')(sio, 'replace')
426
427
        annotate.annotate_file_tree(revtree_2, 'b',
427
 
                                    to_file=to_file, branch=tree1.branch)
428
 
        self.assertEqualDiff(b'2   p?rez   | bye\n', sio.getvalue())
 
428
            to_file=to_file, branch=tree1.branch)
 
429
        self.assertEqualDiff('2   p?rez   | bye\n', sio.getvalue())
429
430
 
430
431
        # test now with unicode file-like
431
432
        to_file = StringIOWithEncoding()
432
433
        annotate.annotate_file_tree(revtree_2, 'b',
433
 
                                    to_file=to_file, branch=tree1.branch)
 
434
            to_file=to_file, branch=tree1.branch)
434
435
        self.assertContainsRe(u'2   p\xe9rez   | bye\n', to_file.getvalue())
435
436
 
436
437
    def test_annotate_author_or_committer(self):
437
438
        tree1 = self.make_branch_and_tree('tree1')
438
439
 
439
 
        self.build_tree_contents([('tree1/a', b'hello')])
440
 
        tree1.add(['a'], [b'a-id'])
441
 
        tree1.commit('a', rev_id=b'rev-1',
 
440
        self.build_tree_contents([('tree1/a', 'hello')])
 
441
        tree1.add(['a'], ['a-id'])
 
442
        tree1.commit('a', rev_id='rev-1',
442
443
                     committer='Committer <committer@example.com>',
443
444
                     timestamp=1166046000.00, timezone=0)
444
445
 
445
 
        self.build_tree_contents([('tree1/b', b'bye')])
446
 
        tree1.add(['b'], [b'b-id'])
447
 
        tree1.commit('b', rev_id=b'rev-2',
 
446
        self.build_tree_contents([('tree1/b', 'bye')])
 
447
        tree1.add(['b'], ['b-id'])
 
448
        tree1.commit('b', rev_id='rev-2',
448
449
                     committer='Committer <committer@example.com>',
449
450
                     authors=['Author <author@example.com>'],
450
451
                     timestamp=1166046000.00, timezone=0)
453
454
        self.addCleanup(tree1.unlock)
454
455
 
455
456
        self.assertBranchAnnotate('1   committ | hello\n', tree1.branch,
456
 
                                  'a', b'rev-1')
 
457
            'a', 'rev-1')
457
458
 
 
459
        to_file = BytesIO()
458
460
        self.assertBranchAnnotate('2   author@ | bye\n', tree1.branch,
459
 
                                  'b', b'rev-2')
 
461
            'b', 'rev-2')
460
462
 
461
463
 
462
464
class TestReannotate(tests.TestCase):
464
466
    def annotateEqual(self, expected, parents, newlines, revision_id,
465
467
                      blocks=None):
466
468
        annotate_list = list(annotate.reannotate(parents, newlines,
467
 
                                                 revision_id, blocks))
 
469
                             revision_id, blocks))
468
470
        self.assertEqual(len(expected), len(annotate_list))
469
471
        for e, a in zip(expected, annotate_list):
470
472
            self.assertEqual(e, a)
471
473
 
472
474
    def test_reannotate(self):
473
 
        self.annotateEqual(parent_1, [parent_1], new_1, b'blahblah')
474
 
        self.annotateEqual(expected_2_1, [parent_2], new_1, b'blahblah')
 
475
        self.annotateEqual(parent_1, [parent_1], new_1, 'blahblah')
 
476
        self.annotateEqual(expected_2_1, [parent_2], new_1, 'blahblah')
475
477
        self.annotateEqual(expected_1_2_2, [parent_1, parent_2], new_2,
476
 
                           b'blahblah')
 
478
                           'blahblah')
477
479
 
478
480
    def test_reannotate_no_parents(self):
479
 
        self.annotateEqual(expected_1, [], new_1, b'blahblah')
 
481
        self.annotateEqual(expected_1, [], new_1, 'blahblah')
480
482
 
481
483
    def test_reannotate_left_matching_blocks(self):
482
484
        """Ensure that left_matching_blocks has an impact.
484
486
        In this case, the annotation is ambiguous, so the hint isn't actually
485
487
        lying.
486
488
        """
487
 
        parent = [(b'rev1', b'a\n')]
488
 
        new_text = [b'a\n', b'a\n']
 
489
        parent = [('rev1', 'a\n')]
 
490
        new_text = ['a\n', 'a\n']
489
491
        blocks = [(0, 0, 1), (1, 2, 0)]
490
 
        self.annotateEqual([(b'rev1', b'a\n'), (b'rev2', b'a\n')], [parent],
491
 
                           new_text, b'rev2', blocks)
 
492
        self.annotateEqual([('rev1', 'a\n'), ('rev2', 'a\n')], [parent],
 
493
                           new_text, 'rev2', blocks)
492
494
        blocks = [(0, 1, 1), (1, 2, 0)]
493
 
        self.annotateEqual([(b'rev2', b'a\n'), (b'rev1', b'a\n')], [parent],
494
 
                           new_text, b'rev2', blocks)
 
495
        self.annotateEqual([('rev2', 'a\n'), ('rev1', 'a\n')], [parent],
 
496
                           new_text, 'rev2', blocks)