261
260
('modify', ('file-id', e_text))])
264
def assertAnnotateEqualDiff(self, actual, expected):
263
def assertRepoAnnotate(self, expected, repo, file_id, revision_id):
264
"""Assert that the revision is properly annotated."""
265
actual = list(repo.revision_tree(revision_id).annotate_iter(file_id))
265
266
if actual != expected:
266
267
# Create an easier to understand diff when the lines don't actually
268
269
self.assertEqualDiff(''.join('\t'.join(l) for l in expected),
269
270
''.join('\t'.join(l) for l in actual))
271
def assertBranchAnnotate(self, expected, branch, file_id, revision_id,
272
verbose=False, full=False, show_ids=False):
273
tree = branch.repository.revision_tree(revision_id)
275
annotate.annotate_file_tree(tree, file_id, to_file,
276
verbose=verbose, full=full, show_ids=show_ids, branch=branch)
277
self.assertAnnotateEqualDiff(to_file.getvalue(), expected)
279
def assertRepoAnnotate(self, expected, repo, file_id, revision_id):
280
"""Assert that the revision is properly annotated."""
281
actual = list(repo.revision_tree(revision_id).annotate_iter(file_id))
282
self.assertAnnotateEqualDiff(actual, expected)
284
272
def test_annotate_duplicate_lines(self):
285
273
# XXX: Should this be a per_repository test?
286
274
builder = self.create_duplicate_lines_tree()
297
285
def test_annotate_shows_dotted_revnos(self):
298
286
builder = self.create_merged_trees()
300
self.assertBranchAnnotate('1 joe@foo | first\n'
301
'2 joe@foo | second\n'
302
'1.1.1 barry@f | third\n',
303
builder.get_branch(), 'a-id', 'rev-3')
305
def test_annotate_file(self):
306
builder = self.create_merged_trees()
309
self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
310
annotate.annotate_file, builder.get_branch(),
311
'rev-3', 'a-id', to_file=to_file)
313
self.assertAnnotateEqualDiff('1 joe@foo | first\n'
314
'2 joe@foo | second\n'
315
'1.1.1 barry@f | third\n',
289
annotate.annotate_file(builder.get_branch(), 'rev-3', 'a-id',
291
self.assertEqualDiff('1 joe@foo | first\n'
292
'2 joe@foo | second\n'
293
'1.1.1 barry@f | third\n',
318
296
def test_annotate_limits_dotted_revnos(self):
319
297
"""Annotate should limit dotted revnos to a depth of 12"""
320
298
builder = self.create_deeply_merged_trees()
322
self.assertBranchAnnotate('1 joe@foo | first\n'
323
'2 joe@foo | second\n'
324
'1.1.1 barry@f | third\n'
325
'1.2.1 jerry@f | fourth\n'
326
'1.3.1 george@ | fifth\n'
328
builder.get_branch(), 'a-id', 'rev-6',
329
verbose=False, full=False)
301
annotate.annotate_file(builder.get_branch(), 'rev-6', 'a-id',
302
to_file=sio, verbose=False, full=False)
303
self.assertEqualDiff('1 joe@foo | first\n'
304
'2 joe@foo | second\n'
305
'1.1.1 barry@f | third\n'
306
'1.2.1 jerry@f | fourth\n'
307
'1.3.1 george@ | fifth\n'
331
self.assertBranchAnnotate('1 joe@foo | first\n'
332
'2 joe@foo | second\n'
333
'1.1.1 barry@f | third\n'
334
'1.2.1 jerry@f | fourth\n'
335
'1.3.1 george@ | fifth\n'
336
'1.3.1 george@ | sixth\n',
337
builder.get_branch(), 'a-id', 'rev-6',
338
verbose=False, full=True)
312
annotate.annotate_file(builder.get_branch(), 'rev-6', 'a-id',
313
to_file=sio, verbose=False, full=True)
314
self.assertEqualDiff('1 joe@foo | first\n'
315
'2 joe@foo | second\n'
316
'1.1.1 barry@f | third\n'
317
'1.2.1 jerry@f | fourth\n'
318
'1.3.1 george@ | fifth\n'
319
'1.3.1 george@ | sixth\n',
340
322
# verbose=True shows everything, the full revno, user id, and date
341
self.assertBranchAnnotate('1 joe@foo.com 20061213 | first\n'
342
'2 joe@foo.com 20061213 | second\n'
343
'1.1.1 barry@foo.com 20061213 | third\n'
344
'1.2.1 jerry@foo.com 20061213 | fourth\n'
345
'1.3.1 george@foo.com 20061213 | fifth\n'
347
builder.get_branch(), 'a-id', 'rev-6',
348
verbose=True, full=False)
324
annotate.annotate_file(builder.get_branch(), 'rev-6', 'a-id',
325
to_file=sio, verbose=True, full=False)
326
self.assertEqualDiff('1 joe@foo.com 20061213 | first\n'
327
'2 joe@foo.com 20061213 | second\n'
328
'1.1.1 barry@foo.com 20061213 | third\n'
329
'1.2.1 jerry@foo.com 20061213 | fourth\n'
330
'1.3.1 george@foo.com 20061213 | fifth\n'
350
self.assertBranchAnnotate('1 joe@foo.com 20061213 | first\n'
351
'2 joe@foo.com 20061213 | second\n'
352
'1.1.1 barry@foo.com 20061213 | third\n'
353
'1.2.1 jerry@foo.com 20061213 | fourth\n'
354
'1.3.1 george@foo.com 20061213 | fifth\n'
355
'1.3.1 george@foo.com 20061213 | sixth\n',
356
builder.get_branch(), 'a-id', 'rev-6',
357
verbose=True, full=True)
335
annotate.annotate_file(builder.get_branch(), 'rev-6', 'a-id',
336
to_file=sio, verbose=True, full=True)
337
self.assertEqualDiff('1 joe@foo.com 20061213 | first\n'
338
'2 joe@foo.com 20061213 | second\n'
339
'1.1.1 barry@foo.com 20061213 | third\n'
340
'1.2.1 jerry@foo.com 20061213 | fourth\n'
341
'1.3.1 george@foo.com 20061213 | fifth\n'
342
'1.3.1 george@foo.com 20061213 | sixth\n',
359
345
def test_annotate_uses_branch_context(self):
360
346
"""Dotted revnos should use the Branch context.
365
351
builder = self.create_deeply_merged_trees()
367
self.assertBranchAnnotate('1 joe@foo | first\n'
368
'1.1.1 barry@f | third\n'
369
'1.2.1 jerry@f | fourth\n'
370
'1.3.1 george@ | fifth\n'
372
builder.get_branch(), 'a-id', 'rev-1_3_1',
373
verbose=False, full=False)
354
annotate.annotate_file(builder.get_branch(), 'rev-1_3_1', 'a-id',
355
to_file=sio, verbose=False, full=False)
356
self.assertEqualDiff('1 joe@foo | first\n'
357
'1.1.1 barry@f | third\n'
358
'1.2.1 jerry@f | fourth\n'
359
'1.3.1 george@ | fifth\n'
375
363
def test_annotate_show_ids(self):
376
364
builder = self.create_deeply_merged_trees()
367
annotate.annotate_file(builder.get_branch(), 'rev-6', 'a-id',
368
to_file=sio, show_ids=True, full=False)
378
370
# It looks better with real revision ids :)
379
self.assertBranchAnnotate(' rev-1 | first\n'
381
'rev-1_1_1 | third\n'
382
'rev-1_2_1 | fourth\n'
383
'rev-1_3_1 | fifth\n'
385
builder.get_branch(), 'a-id', 'rev-6',
386
show_ids=True, full=False)
388
self.assertBranchAnnotate(' rev-1 | first\n'
390
'rev-1_1_1 | third\n'
391
'rev-1_2_1 | fourth\n'
392
'rev-1_3_1 | fifth\n'
393
'rev-1_3_1 | sixth\n',
394
builder.get_branch(), 'a-id', 'rev-6',
395
show_ids=True, full=True)
371
self.assertEqualDiff(' rev-1 | first\n'
373
'rev-1_1_1 | third\n'
374
'rev-1_2_1 | fourth\n'
375
'rev-1_3_1 | fifth\n'
380
annotate.annotate_file(builder.get_branch(), 'rev-6', 'a-id',
381
to_file=sio, show_ids=True, full=True)
383
self.assertEqualDiff(' rev-1 | first\n'
385
'rev-1_1_1 | third\n'
386
'rev-1_2_1 | fourth\n'
387
'rev-1_3_1 | fifth\n'
388
'rev-1_3_1 | sixth\n',
397
391
def test_annotate_unicode_author(self):
398
392
tree1 = self.make_branch_and_tree('tree1')
412
406
tree1.lock_read()
413
407
self.addCleanup(tree1.unlock)
415
revtree_1 = tree1.branch.repository.revision_tree('rev-1')
416
revtree_2 = tree1.branch.repository.revision_tree('rev-2')
418
408
# this passes if no exception is raised
419
409
to_file = StringIO()
420
annotate.annotate_file_tree(revtree_1, 'a-id',
421
to_file=to_file, branch=tree1.branch)
410
annotate.annotate_file(tree1.branch, 'rev-1', 'a-id', to_file=to_file)
424
413
to_file = codecs.getwriter('ascii')(sio)
425
414
to_file.encoding = 'ascii' # codecs does not set it
426
annotate.annotate_file_tree(revtree_2, 'b-id',
427
to_file=to_file, branch=tree1.branch)
415
annotate.annotate_file(tree1.branch, 'rev-2', 'b-id', to_file=to_file)
428
416
self.assertEqualDiff('2 p?rez | bye\n', sio.getvalue())
430
418
# test now with to_file.encoding = None
431
419
to_file = tests.StringIOWrapper()
432
420
to_file.encoding = None
433
annotate.annotate_file_tree(revtree_2, 'b-id',
434
to_file=to_file, branch=tree1.branch)
421
annotate.annotate_file(tree1.branch, 'rev-2', 'b-id', to_file=to_file)
435
422
self.assertContainsRe('2 p.rez | bye\n', to_file.getvalue())
437
424
# and when it does not exist
438
425
to_file = StringIO()
439
annotate.annotate_file_tree(revtree_2, 'b-id',
440
to_file=to_file, branch=tree1.branch)
426
annotate.annotate_file(tree1.branch, 'rev-2', 'b-id', to_file=to_file)
441
427
self.assertContainsRe('2 p.rez | bye\n', to_file.getvalue())
443
429
def test_annotate_author_or_committer(self):
added
removed
bzrlib/tests/test_annotate.py
