/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: 2017-06-08 23:30:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170608233031-3qavls2o7a1pqllj
Update imports.

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
177
179
        builder = self.make_branch_builder('branch')
178
180
        builder.start_series()
179
181
        self.addCleanup(builder.finish_series)
180
 
        builder.build_snapshot(None, [
181
 
            ('add', ('', b'root-id', 'directory', None)),
182
 
            ('add', ('a', b'a-id', 'file', b'first\n')),
183
 
            ], 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')),
187
 
            ], 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')),
191
 
            ], 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')),
195
 
            ], timestamp=1166046003.00, timezone=0, committer="sal@foo.com",
196
 
            revision_id=b'rev-3')
 
182
        builder.build_snapshot('rev-1', None, [
 
183
            ('add', ('', 'root-id', 'directory', None)),
 
184
            ('add', ('a', 'a-id', 'file', 'first\n')),
 
185
            ], timestamp=1166046000.00, timezone=0, committer="joe@foo.com")
 
186
        builder.build_snapshot('rev-2', ['rev-1'], [
 
187
            ('modify', ('a-id', 'first\nsecond\n')),
 
188
            ], timestamp=1166046001.00, timezone=0, committer="joe@foo.com")
 
189
        builder.build_snapshot('rev-1_1_1', ['rev-1'], [
 
190
            ('modify', ('a-id', 'first\nthird\n')),
 
191
            ], timestamp=1166046002.00, timezone=0, committer="barry@foo.com")
 
192
        builder.build_snapshot('rev-3', ['rev-2', 'rev-1_1_1'], [
 
193
            ('modify', ('a-id', 'first\nsecond\nthird\n')),
 
194
            ], timestamp=1166046003.00, timezone=0, committer="sal@foo.com")
197
195
        return builder
198
196
 
199
197
    def create_deeply_merged_trees(self):
220
218
        rev-6
221
219
        """
222
220
        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')),
228
 
            ], 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')),
235
 
            ], 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')),
239
 
            ], 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')
 
221
        builder.build_snapshot('rev-1_1_2', ['rev-1_1_1'], [])
 
222
        builder.build_snapshot('rev-4', ['rev-3', 'rev-1_1_2'], [])
 
223
        builder.build_snapshot('rev-1_2_1', ['rev-1_1_1'], [
 
224
            ('modify', ('a-id', 'first\nthird\nfourth\n')),
 
225
            ], timestamp=1166046003.00, timezone=0, committer="jerry@foo.com")
 
226
        builder.build_snapshot('rev-1_2_2', ['rev-1_2_1'], [],
 
227
            timestamp=1166046004.00, timezone=0, committer="jerry@foo.com")
 
228
        builder.build_snapshot('rev-5', ['rev-4', 'rev-1_2_2'], [
 
229
            ('modify', ('a-id', 'first\nsecond\nthird\nfourth\n')),
 
230
            ], timestamp=1166046004.00, timezone=0, committer="jerry@foo.com")
 
231
        builder.build_snapshot('rev-1_3_1', ['rev-1_2_1'], [
 
232
            ('modify', ('a-id', 'first\nthird\nfourth\nfifth\nsixth\n')),
 
233
            ], timestamp=1166046005.00, timezone=0, committer="george@foo.com")
 
234
        builder.build_snapshot('rev-6', ['rev-5', 'rev-1_3_1'], [
 
235
            ('modify', ('a-id',
 
236
                        'first\nsecond\nthird\nfourth\nfifth\nsixth\n')),
 
237
            ])
245
238
        return builder
246
239
 
247
240
    def create_duplicate_lines_tree(self):
248
241
        builder = self.make_branch_builder('branch')
249
242
        builder.start_series()
250
243
        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)
257
 
        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')
 
244
        base_text = ''.join(l for r, l in duplicate_base)
 
245
        a_text = ''.join(l for r, l in duplicate_A)
 
246
        b_text = ''.join(l for r, l in duplicate_B)
 
247
        c_text = ''.join(l for r, l in duplicate_C)
 
248
        d_text = ''.join(l for r, l in duplicate_D)
 
249
        e_text = ''.join(l for r, l in duplicate_E)
 
250
        builder.build_snapshot('rev-base', None, [
 
251
            ('add', ('', 'root-id', 'directory', None)),
 
252
            ('add', ('file', 'file-id', 'file', base_text)),
 
253
            ])
 
254
        builder.build_snapshot('rev-A', ['rev-base'], [
 
255
            ('modify', ('file-id', a_text))])
 
256
        builder.build_snapshot('rev-B', ['rev-base'], [
 
257
            ('modify', ('file-id', b_text))])
 
258
        builder.build_snapshot('rev-C', ['rev-A'], [
 
259
            ('modify', ('file-id', c_text))])
 
260
        builder.build_snapshot('rev-D', ['rev-B', 'rev-A'], [
 
261
            ('modify', ('file-id', d_text))])
 
262
        builder.build_snapshot('rev-E', ['rev-C', 'rev-D'], [
 
263
            ('modify', ('file-id', e_text))])
276
264
        return builder
277
265
 
278
266
    def assertAnnotateEqualDiff(self, actual, expected):
282
270
            self.assertEqualDiff(''.join('\t'.join(l) for l in expected),
283
271
                                 ''.join('\t'.join(l) for l in actual))
284
272
 
285
 
    def assertBranchAnnotate(self, expected, branch, path, revision_id,
286
 
                             verbose=False, full=False, show_ids=False):
 
273
    def assertBranchAnnotate(self, expected, branch, file_id, revision_id,
 
274
            verbose=False, full=False, show_ids=False):
287
275
        tree = branch.repository.revision_tree(revision_id)
288
 
        to_file = StringIO()
289
 
        annotate.annotate_file_tree(tree, path, to_file,
290
 
                                    verbose=verbose, full=full, show_ids=show_ids, branch=branch)
 
276
        to_file = BytesIO()
 
277
        annotate.annotate_file_tree(tree, file_id, to_file,
 
278
            verbose=verbose, full=full, show_ids=show_ids, branch=branch)
291
279
        self.assertAnnotateEqualDiff(to_file.getvalue(), expected)
292
280
 
293
 
    def assertRepoAnnotate(self, expected, repo, path, revision_id):
 
281
    def assertRepoAnnotate(self, expected, repo, file_id, revision_id):
294
282
        """Assert that the revision is properly annotated."""
295
 
        actual = list(repo.revision_tree(revision_id).annotate_iter(path))
 
283
        actual = list(repo.revision_tree(revision_id).annotate_iter(file_id))
296
284
        self.assertAnnotateEqualDiff(actual, expected)
297
285
 
298
286
    def test_annotate_duplicate_lines(self):
301
289
        repo = builder.get_branch().repository
302
290
        repo.lock_read()
303
291
        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')
 
292
        self.assertRepoAnnotate(duplicate_base, repo, 'file-id', 'rev-base')
 
293
        self.assertRepoAnnotate(duplicate_A, repo, 'file-id', 'rev-A')
 
294
        self.assertRepoAnnotate(duplicate_B, repo, 'file-id', 'rev-B')
 
295
        self.assertRepoAnnotate(duplicate_C, repo, 'file-id', 'rev-C')
 
296
        self.assertRepoAnnotate(duplicate_D, repo, 'file-id', 'rev-D')
 
297
        self.assertRepoAnnotate(duplicate_E, repo, 'file-id', 'rev-E')
310
298
 
311
299
    def test_annotate_shows_dotted_revnos(self):
312
300
        builder = self.create_merged_trees()
314
302
        self.assertBranchAnnotate('1     joe@foo | first\n'
315
303
                                  '2     joe@foo | second\n'
316
304
                                  '1.1.1 barry@f | third\n',
317
 
                                  builder.get_branch(), 'a', b'rev-3')
 
305
                                  builder.get_branch(), 'a-id', 'rev-3')
318
306
 
319
307
    def test_annotate_limits_dotted_revnos(self):
320
308
        """Annotate should limit dotted revnos to a depth of 12"""
326
314
                                  '1.2.1 jerry@f | fourth\n'
327
315
                                  '1.3.1 george@ | fifth\n'
328
316
                                  '              | sixth\n',
329
 
                                  builder.get_branch(), 'a', b'rev-6',
 
317
                                  builder.get_branch(), 'a-id', 'rev-6',
330
318
                                  verbose=False, full=False)
331
319
 
332
320
        self.assertBranchAnnotate('1     joe@foo | first\n'
335
323
                                  '1.2.1 jerry@f | fourth\n'
336
324
                                  '1.3.1 george@ | fifth\n'
337
325
                                  '1.3.1 george@ | sixth\n',
338
 
                                  builder.get_branch(), 'a', b'rev-6',
 
326
                                  builder.get_branch(), 'a-id', 'rev-6',
339
327
                                  verbose=False, full=True)
340
328
 
341
329
        # verbose=True shows everything, the full revno, user id, and date
345
333
                                  '1.2.1 jerry@foo.com  20061213 | fourth\n'
346
334
                                  '1.3.1 george@foo.com 20061213 | fifth\n'
347
335
                                  '                              | sixth\n',
348
 
                                  builder.get_branch(), 'a', b'rev-6',
 
336
                                  builder.get_branch(), 'a-id', 'rev-6',
349
337
                                  verbose=True, full=False)
350
338
 
351
339
        self.assertBranchAnnotate('1     joe@foo.com    20061213 | first\n'
354
342
                                  '1.2.1 jerry@foo.com  20061213 | fourth\n'
355
343
                                  '1.3.1 george@foo.com 20061213 | fifth\n'
356
344
                                  '1.3.1 george@foo.com 20061213 | sixth\n',
357
 
                                  builder.get_branch(), 'a', b'rev-6',
 
345
                                  builder.get_branch(), 'a-id', 'rev-6',
358
346
                                  verbose=True, full=True)
359
347
 
360
348
    def test_annotate_uses_branch_context(self):
370
358
                                  '1.2.1 jerry@f | fourth\n'
371
359
                                  '1.3.1 george@ | fifth\n'
372
360
                                  '              | sixth\n',
373
 
                                  builder.get_branch(), 'a', b'rev-1_3_1',
 
361
                                  builder.get_branch(), 'a-id', 'rev-1_3_1',
374
362
                                  verbose=False, full=False)
375
363
 
376
364
    def test_annotate_show_ids(self):
383
371
                                  'rev-1_2_1 | fourth\n'
384
372
                                  'rev-1_3_1 | fifth\n'
385
373
                                  '          | sixth\n',
386
 
                                  builder.get_branch(), 'a', b'rev-6',
 
374
                                  builder.get_branch(), 'a-id', 'rev-6',
387
375
                                  show_ids=True, full=False)
388
376
 
389
377
        self.assertBranchAnnotate('    rev-1 | first\n'
392
380
                                  'rev-1_2_1 | fourth\n'
393
381
                                  'rev-1_3_1 | fifth\n'
394
382
                                  'rev-1_3_1 | sixth\n',
395
 
                                  builder.get_branch(), 'a', b'rev-6',
 
383
                                  builder.get_branch(), 'a-id', 'rev-6',
396
384
                                  show_ids=True, full=True)
397
385
 
398
386
    def test_annotate_unicode_author(self):
399
387
        tree1 = self.make_branch_and_tree('tree1')
400
388
 
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',
 
389
        self.build_tree_contents([('tree1/a', 'adi\xc3\xb3s')])
 
390
        tree1.add(['a'], ['a-id'])
 
391
        tree1.commit('a', rev_id='rev-1',
404
392
                     committer=u'Pepe P\xe9rez <pperez@ejemplo.com>',
405
393
                     timestamp=1166046000.00, timezone=0)
406
394
 
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',
 
395
        self.build_tree_contents([('tree1/b', 'bye')])
 
396
        tree1.add(['b'], ['b-id'])
 
397
        tree1.commit('b', rev_id='rev-2',
410
398
                     committer=u'p\xe9rez',
411
399
                     timestamp=1166046000.00, timezone=0)
412
400
 
413
401
        tree1.lock_read()
414
402
        self.addCleanup(tree1.unlock)
415
403
 
416
 
        revtree_1 = tree1.branch.repository.revision_tree(b'rev-1')
417
 
        revtree_2 = tree1.branch.repository.revision_tree(b'rev-2')
 
404
        revtree_1 = tree1.branch.repository.revision_tree('rev-1')
 
405
        revtree_2 = tree1.branch.repository.revision_tree('rev-2')
418
406
 
419
407
        # this passes if no exception is raised
420
 
        to_file = StringIO()
421
 
        annotate.annotate_file_tree(revtree_1, 'a',
422
 
                                    to_file=to_file, branch=tree1.branch)
 
408
        to_file = BytesIO()
 
409
        annotate.annotate_file_tree(revtree_1, 'a-id',
 
410
            to_file=to_file, branch=tree1.branch)
423
411
 
424
412
        sio = BytesIO()
425
413
        to_file = codecs.getwriter('ascii')(sio, 'replace')
426
 
        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())
 
414
        annotate.annotate_file_tree(revtree_2, 'b-id',
 
415
            to_file=to_file, branch=tree1.branch)
 
416
        self.assertEqualDiff('2   p?rez   | bye\n', sio.getvalue())
429
417
 
430
418
        # test now with unicode file-like
431
419
        to_file = StringIOWithEncoding()
432
 
        annotate.annotate_file_tree(revtree_2, 'b',
433
 
                                    to_file=to_file, branch=tree1.branch)
 
420
        annotate.annotate_file_tree(revtree_2, 'b-id',
 
421
            to_file=to_file, branch=tree1.branch)
434
422
        self.assertContainsRe(u'2   p\xe9rez   | bye\n', to_file.getvalue())
435
423
 
436
424
    def test_annotate_author_or_committer(self):
437
425
        tree1 = self.make_branch_and_tree('tree1')
438
426
 
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',
 
427
        self.build_tree_contents([('tree1/a', 'hello')])
 
428
        tree1.add(['a'], ['a-id'])
 
429
        tree1.commit('a', rev_id='rev-1',
442
430
                     committer='Committer <committer@example.com>',
443
431
                     timestamp=1166046000.00, timezone=0)
444
432
 
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',
 
433
        self.build_tree_contents([('tree1/b', 'bye')])
 
434
        tree1.add(['b'], ['b-id'])
 
435
        tree1.commit('b', rev_id='rev-2',
448
436
                     committer='Committer <committer@example.com>',
449
437
                     authors=['Author <author@example.com>'],
450
438
                     timestamp=1166046000.00, timezone=0)
453
441
        self.addCleanup(tree1.unlock)
454
442
 
455
443
        self.assertBranchAnnotate('1   committ | hello\n', tree1.branch,
456
 
                                  'a', b'rev-1')
 
444
            'a-id', 'rev-1')
457
445
 
 
446
        to_file = BytesIO()
458
447
        self.assertBranchAnnotate('2   author@ | bye\n', tree1.branch,
459
 
                                  'b', b'rev-2')
 
448
            'b-id', 'rev-2')
460
449
 
461
450
 
462
451
class TestReannotate(tests.TestCase):
464
453
    def annotateEqual(self, expected, parents, newlines, revision_id,
465
454
                      blocks=None):
466
455
        annotate_list = list(annotate.reannotate(parents, newlines,
467
 
                                                 revision_id, blocks))
 
456
                             revision_id, blocks))
468
457
        self.assertEqual(len(expected), len(annotate_list))
469
458
        for e, a in zip(expected, annotate_list):
470
459
            self.assertEqual(e, a)
471
460
 
472
461
    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')
 
462
        self.annotateEqual(parent_1, [parent_1], new_1, 'blahblah')
 
463
        self.annotateEqual(expected_2_1, [parent_2], new_1, 'blahblah')
475
464
        self.annotateEqual(expected_1_2_2, [parent_1, parent_2], new_2,
476
 
                           b'blahblah')
 
465
                           'blahblah')
477
466
 
478
467
    def test_reannotate_no_parents(self):
479
 
        self.annotateEqual(expected_1, [], new_1, b'blahblah')
 
468
        self.annotateEqual(expected_1, [], new_1, 'blahblah')
480
469
 
481
470
    def test_reannotate_left_matching_blocks(self):
482
471
        """Ensure that left_matching_blocks has an impact.
484
473
        In this case, the annotation is ambiguous, so the hint isn't actually
485
474
        lying.
486
475
        """
487
 
        parent = [(b'rev1', b'a\n')]
488
 
        new_text = [b'a\n', b'a\n']
 
476
        parent = [('rev1', 'a\n')]
 
477
        new_text = ['a\n', 'a\n']
489
478
        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)
 
479
        self.annotateEqual([('rev1', 'a\n'), ('rev2', 'a\n')], [parent],
 
480
                           new_text, 'rev2', blocks)
492
481
        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)
 
482
        self.annotateEqual([('rev2', 'a\n'), ('rev1', 'a\n')], [parent],
 
483
                           new_text, 'rev2', blocks)