/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 bzrlib/tests/test_annotate.py

  • Committer: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_annotate.py
17
17
"""Whitebox tests for annotate functionality."""
18
18
 
19
19
import codecs
 
20
from cStringIO import StringIO
20
21
 
21
 
from .. import (
 
22
from bzrlib import (
22
23
    annotate,
 
24
    symbol_versioning,
23
25
    tests,
24
26
    )
25
 
from ..sixish import (
26
 
    BytesIO,
27
 
    )
28
 
from .ui_testing import StringIOWithEncoding
29
27
 
30
28
 
31
29
def annotation(text):
179
177
        builder = self.make_branch_builder('branch')
180
178
        builder.start_series()
181
179
        self.addCleanup(builder.finish_series)
182
 
        builder.build_snapshot(None, [
 
180
        builder.build_snapshot('rev-1', None, [
183
181
            ('add', ('', 'root-id', 'directory', None)),
184
182
            ('add', ('a', 'a-id', 'file', 'first\n')),
185
 
            ], timestamp=1166046000.00, timezone=0, committer="joe@foo.com",
186
 
            revision_id='rev-1')
187
 
        builder.build_snapshot(['rev-1'], [
188
 
            ('modify', ('a', 'first\nsecond\n')),
189
 
            ], timestamp=1166046001.00, timezone=0, committer="joe@foo.com",
190
 
            revision_id='rev-2')
191
 
        builder.build_snapshot(['rev-1'], [
192
 
            ('modify', ('a', 'first\nthird\n')),
193
 
            ], timestamp=1166046002.00, timezone=0, committer="barry@foo.com",
194
 
            revision_id='rev-1_1_1')
195
 
        builder.build_snapshot(['rev-2', 'rev-1_1_1'], [
196
 
            ('modify', ('a', 'first\nsecond\nthird\n')),
197
 
            ], timestamp=1166046003.00, timezone=0, committer="sal@foo.com",
198
 
            revision_id='rev-3')
 
183
            ], timestamp=1166046000.00, timezone=0, committer="joe@foo.com")
 
184
        builder.build_snapshot('rev-2', ['rev-1'], [
 
185
            ('modify', ('a-id', 'first\nsecond\n')),
 
186
            ], timestamp=1166046001.00, timezone=0, committer="joe@foo.com")
 
187
        builder.build_snapshot('rev-1_1_1', ['rev-1'], [
 
188
            ('modify', ('a-id', 'first\nthird\n')),
 
189
            ], timestamp=1166046002.00, timezone=0, committer="barry@foo.com")
 
190
        builder.build_snapshot('rev-3', ['rev-2', 'rev-1_1_1'], [
 
191
            ('modify', ('a-id', 'first\nsecond\nthird\n')),
 
192
            ], timestamp=1166046003.00, timezone=0, committer="sal@foo.com")
199
193
        return builder
200
194
 
201
195
    def create_deeply_merged_trees(self):
222
216
        rev-6
223
217
        """
224
218
        builder = self.create_merged_trees()
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', 'first\nthird\nfourth\n')),
229
 
            ], timestamp=1166046003.00, timezone=0, committer="jerry@foo.com",
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', 'first\nsecond\nthird\nfourth\n')),
236
 
            ], timestamp=1166046004.00, timezone=0, committer="jerry@foo.com",
237
 
            revision_id='rev-5')
238
 
        builder.build_snapshot(['rev-1_2_1'], [
239
 
            ('modify', ('a', 'first\nthird\nfourth\nfifth\nsixth\n')),
240
 
            ], timestamp=1166046005.00, timezone=0, committer="george@foo.com",
241
 
            revision_id='rev-1_3_1')
242
 
        builder.build_snapshot(['rev-5', 'rev-1_3_1'], [
243
 
            ('modify', ('a',
 
219
        builder.build_snapshot('rev-1_1_2', ['rev-1_1_1'], [])
 
220
        builder.build_snapshot('rev-4', ['rev-3', 'rev-1_1_2'], [])
 
221
        builder.build_snapshot('rev-1_2_1', ['rev-1_1_1'], [
 
222
            ('modify', ('a-id', 'first\nthird\nfourth\n')),
 
223
            ], timestamp=1166046003.00, timezone=0, committer="jerry@foo.com")
 
224
        builder.build_snapshot('rev-1_2_2', ['rev-1_2_1'], [],
 
225
            timestamp=1166046004.00, timezone=0, committer="jerry@foo.com")
 
226
        builder.build_snapshot('rev-5', ['rev-4', 'rev-1_2_2'], [
 
227
            ('modify', ('a-id', 'first\nsecond\nthird\nfourth\n')),
 
228
            ], timestamp=1166046004.00, timezone=0, committer="jerry@foo.com")
 
229
        builder.build_snapshot('rev-1_3_1', ['rev-1_2_1'], [
 
230
            ('modify', ('a-id', 'first\nthird\nfourth\nfifth\nsixth\n')),
 
231
            ], timestamp=1166046005.00, timezone=0, committer="george@foo.com")
 
232
        builder.build_snapshot('rev-6', ['rev-5', 'rev-1_3_1'], [
 
233
            ('modify', ('a-id',
244
234
                        'first\nsecond\nthird\nfourth\nfifth\nsixth\n')),
245
 
            ], revision_id='rev-6')
 
235
            ])
246
236
        return builder
247
237
 
248
238
    def create_duplicate_lines_tree(self):
255
245
        c_text = ''.join(l for r, l in duplicate_C)
256
246
        d_text = ''.join(l for r, l in duplicate_D)
257
247
        e_text = ''.join(l for r, l in duplicate_E)
258
 
        builder.build_snapshot(None, [
 
248
        builder.build_snapshot('rev-base', None, [
259
249
            ('add', ('', 'root-id', 'directory', None)),
260
250
            ('add', ('file', 'file-id', 'file', base_text)),
261
 
            ], revision_id='rev-base')
262
 
        builder.build_snapshot(['rev-base'], [
263
 
            ('modify', ('file', a_text))],
264
 
            revision_id='rev-A')
265
 
        builder.build_snapshot(['rev-base'], [
266
 
            ('modify', ('file', b_text))],
267
 
            revision_id='rev-B')
268
 
        builder.build_snapshot(['rev-A'], [
269
 
            ('modify', ('file', c_text))],
270
 
            revision_id='rev-C')
271
 
        builder.build_snapshot(['rev-B', 'rev-A'], [
272
 
            ('modify', ('file', d_text))],
273
 
            revision_id='rev-D')
274
 
        builder.build_snapshot(['rev-C', 'rev-D'], [
275
 
            ('modify', ('file', e_text))],
276
 
            revision_id='rev-E')
 
251
            ])
 
252
        builder.build_snapshot('rev-A', ['rev-base'], [
 
253
            ('modify', ('file-id', a_text))])
 
254
        builder.build_snapshot('rev-B', ['rev-base'], [
 
255
            ('modify', ('file-id', b_text))])
 
256
        builder.build_snapshot('rev-C', ['rev-A'], [
 
257
            ('modify', ('file-id', c_text))])
 
258
        builder.build_snapshot('rev-D', ['rev-B', 'rev-A'], [
 
259
            ('modify', ('file-id', d_text))])
 
260
        builder.build_snapshot('rev-E', ['rev-C', 'rev-D'], [
 
261
            ('modify', ('file-id', e_text))])
277
262
        return builder
278
263
 
279
264
    def assertAnnotateEqualDiff(self, actual, expected):
283
268
            self.assertEqualDiff(''.join('\t'.join(l) for l in expected),
284
269
                                 ''.join('\t'.join(l) for l in actual))
285
270
 
286
 
    def assertBranchAnnotate(self, expected, branch, path, revision_id,
 
271
    def assertBranchAnnotate(self, expected, branch, file_id, revision_id,
287
272
            verbose=False, full=False, show_ids=False):
288
273
        tree = branch.repository.revision_tree(revision_id)
289
 
        to_file = BytesIO()
290
 
        annotate.annotate_file_tree(tree, path, to_file,
 
274
        to_file = StringIO()
 
275
        annotate.annotate_file_tree(tree, file_id, to_file,
291
276
            verbose=verbose, full=full, show_ids=show_ids, branch=branch)
292
277
        self.assertAnnotateEqualDiff(to_file.getvalue(), expected)
293
278
 
294
 
    def assertRepoAnnotate(self, expected, repo, path, revision_id):
 
279
    def assertRepoAnnotate(self, expected, repo, file_id, revision_id):
295
280
        """Assert that the revision is properly annotated."""
296
 
        actual = list(repo.revision_tree(revision_id).annotate_iter(path))
 
281
        actual = list(repo.revision_tree(revision_id).annotate_iter(file_id))
297
282
        self.assertAnnotateEqualDiff(actual, expected)
298
283
 
299
284
    def test_annotate_duplicate_lines(self):
302
287
        repo = builder.get_branch().repository
303
288
        repo.lock_read()
304
289
        self.addCleanup(repo.unlock)
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')
 
290
        self.assertRepoAnnotate(duplicate_base, repo, 'file-id', 'rev-base')
 
291
        self.assertRepoAnnotate(duplicate_A, repo, 'file-id', 'rev-A')
 
292
        self.assertRepoAnnotate(duplicate_B, repo, 'file-id', 'rev-B')
 
293
        self.assertRepoAnnotate(duplicate_C, repo, 'file-id', 'rev-C')
 
294
        self.assertRepoAnnotate(duplicate_D, repo, 'file-id', 'rev-D')
 
295
        self.assertRepoAnnotate(duplicate_E, repo, 'file-id', 'rev-E')
311
296
 
312
297
    def test_annotate_shows_dotted_revnos(self):
313
298
        builder = self.create_merged_trees()
315
300
        self.assertBranchAnnotate('1     joe@foo | first\n'
316
301
                                  '2     joe@foo | second\n'
317
302
                                  '1.1.1 barry@f | third\n',
318
 
                                  builder.get_branch(), 'a', 'rev-3')
 
303
                                  builder.get_branch(), 'a-id', 'rev-3')
319
304
 
320
305
    def test_annotate_limits_dotted_revnos(self):
321
306
        """Annotate should limit dotted revnos to a depth of 12"""
327
312
                                  '1.2.1 jerry@f | fourth\n'
328
313
                                  '1.3.1 george@ | fifth\n'
329
314
                                  '              | sixth\n',
330
 
                                  builder.get_branch(), 'a', 'rev-6',
 
315
                                  builder.get_branch(), 'a-id', 'rev-6',
331
316
                                  verbose=False, full=False)
332
317
 
333
318
        self.assertBranchAnnotate('1     joe@foo | first\n'
336
321
                                  '1.2.1 jerry@f | fourth\n'
337
322
                                  '1.3.1 george@ | fifth\n'
338
323
                                  '1.3.1 george@ | sixth\n',
339
 
                                  builder.get_branch(), 'a', 'rev-6',
 
324
                                  builder.get_branch(), 'a-id', 'rev-6',
340
325
                                  verbose=False, full=True)
341
326
 
342
327
        # verbose=True shows everything, the full revno, user id, and date
346
331
                                  '1.2.1 jerry@foo.com  20061213 | fourth\n'
347
332
                                  '1.3.1 george@foo.com 20061213 | fifth\n'
348
333
                                  '                              | sixth\n',
349
 
                                  builder.get_branch(), 'a', 'rev-6',
 
334
                                  builder.get_branch(), 'a-id', 'rev-6',
350
335
                                  verbose=True, full=False)
351
336
 
352
337
        self.assertBranchAnnotate('1     joe@foo.com    20061213 | first\n'
355
340
                                  '1.2.1 jerry@foo.com  20061213 | fourth\n'
356
341
                                  '1.3.1 george@foo.com 20061213 | fifth\n'
357
342
                                  '1.3.1 george@foo.com 20061213 | sixth\n',
358
 
                                  builder.get_branch(), 'a', 'rev-6',
 
343
                                  builder.get_branch(), 'a-id', 'rev-6',
359
344
                                  verbose=True, full=True)
360
345
 
361
346
    def test_annotate_uses_branch_context(self):
371
356
                                  '1.2.1 jerry@f | fourth\n'
372
357
                                  '1.3.1 george@ | fifth\n'
373
358
                                  '              | sixth\n',
374
 
                                  builder.get_branch(), 'a', 'rev-1_3_1',
 
359
                                  builder.get_branch(), 'a-id', 'rev-1_3_1',
375
360
                                  verbose=False, full=False)
376
361
 
377
362
    def test_annotate_show_ids(self):
384
369
                                  'rev-1_2_1 | fourth\n'
385
370
                                  'rev-1_3_1 | fifth\n'
386
371
                                  '          | sixth\n',
387
 
                                  builder.get_branch(), 'a', 'rev-6',
 
372
                                  builder.get_branch(), 'a-id', 'rev-6',
388
373
                                  show_ids=True, full=False)
389
374
 
390
375
        self.assertBranchAnnotate('    rev-1 | first\n'
393
378
                                  'rev-1_2_1 | fourth\n'
394
379
                                  'rev-1_3_1 | fifth\n'
395
380
                                  'rev-1_3_1 | sixth\n',
396
 
                                  builder.get_branch(), 'a', 'rev-6',
 
381
                                  builder.get_branch(), 'a-id', 'rev-6',
397
382
                                  show_ids=True, full=True)
398
383
 
399
384
    def test_annotate_unicode_author(self):
400
385
        tree1 = self.make_branch_and_tree('tree1')
401
386
 
402
 
        self.build_tree_contents([('tree1/a', b'adi\xc3\xb3s')])
403
 
        tree1.add(['a'], [b'a-id'])
404
 
        tree1.commit('a', rev_id=b'rev-1',
 
387
        self.build_tree_contents([('tree1/a', 'adi\xc3\xb3s')])
 
388
        tree1.add(['a'], ['a-id'])
 
389
        tree1.commit('a', rev_id='rev-1',
405
390
                     committer=u'Pepe P\xe9rez <pperez@ejemplo.com>',
406
391
                     timestamp=1166046000.00, timezone=0)
407
392
 
408
 
        self.build_tree_contents([('tree1/b', b'bye')])
409
 
        tree1.add(['b'], [b'b-id'])
410
 
        tree1.commit('b', rev_id=b'rev-2',
 
393
        self.build_tree_contents([('tree1/b', 'bye')])
 
394
        tree1.add(['b'], ['b-id'])
 
395
        tree1.commit('b', rev_id='rev-2',
411
396
                     committer=u'p\xe9rez',
412
397
                     timestamp=1166046000.00, timezone=0)
413
398
 
418
403
        revtree_2 = tree1.branch.repository.revision_tree('rev-2')
419
404
 
420
405
        # this passes if no exception is raised
421
 
        to_file = BytesIO()
422
 
        annotate.annotate_file_tree(revtree_1, 'a',
 
406
        to_file = StringIO()
 
407
        annotate.annotate_file_tree(revtree_1, 'a-id',
423
408
            to_file=to_file, branch=tree1.branch)
424
409
 
425
 
        sio = BytesIO()
426
 
        to_file = codecs.getwriter('ascii')(sio, 'replace')
427
 
        annotate.annotate_file_tree(revtree_2, 'b',
 
410
        sio = StringIO()
 
411
        to_file = codecs.getwriter('ascii')(sio)
 
412
        to_file.encoding = 'ascii' # codecs does not set it
 
413
        annotate.annotate_file_tree(revtree_2, 'b-id',
428
414
            to_file=to_file, branch=tree1.branch)
429
415
        self.assertEqualDiff('2   p?rez   | bye\n', sio.getvalue())
430
416
 
431
 
        # test now with unicode file-like
432
 
        to_file = StringIOWithEncoding()
433
 
        annotate.annotate_file_tree(revtree_2, 'b',
434
 
            to_file=to_file, branch=tree1.branch)
435
 
        self.assertContainsRe(u'2   p\xe9rez   | bye\n', to_file.getvalue())
 
417
        # test now with to_file.encoding = None
 
418
        to_file = tests.StringIOWrapper()
 
419
        to_file.encoding = None
 
420
        annotate.annotate_file_tree(revtree_2, 'b-id',
 
421
            to_file=to_file, branch=tree1.branch)
 
422
        self.assertContainsRe('2   p.rez   | bye\n', to_file.getvalue())
 
423
 
 
424
        # and when it does not exist
 
425
        to_file = StringIO()
 
426
        annotate.annotate_file_tree(revtree_2, 'b-id',
 
427
            to_file=to_file, branch=tree1.branch)
 
428
        self.assertContainsRe('2   p.rez   | bye\n', to_file.getvalue())
436
429
 
437
430
    def test_annotate_author_or_committer(self):
438
431
        tree1 = self.make_branch_and_tree('tree1')
439
432
 
440
 
        self.build_tree_contents([('tree1/a', b'hello')])
441
 
        tree1.add(['a'], [b'a-id'])
442
 
        tree1.commit('a', rev_id=b'rev-1',
 
433
        self.build_tree_contents([('tree1/a', 'hello')])
 
434
        tree1.add(['a'], ['a-id'])
 
435
        tree1.commit('a', rev_id='rev-1',
443
436
                     committer='Committer <committer@example.com>',
444
437
                     timestamp=1166046000.00, timezone=0)
445
438
 
446
 
        self.build_tree_contents([('tree1/b', b'bye')])
447
 
        tree1.add(['b'], [b'b-id'])
448
 
        tree1.commit('b', rev_id=b'rev-2',
 
439
        self.build_tree_contents([('tree1/b', 'bye')])
 
440
        tree1.add(['b'], ['b-id'])
 
441
        tree1.commit('b', rev_id='rev-2',
449
442
                     committer='Committer <committer@example.com>',
450
443
                     authors=['Author <author@example.com>'],
451
444
                     timestamp=1166046000.00, timezone=0)
454
447
        self.addCleanup(tree1.unlock)
455
448
 
456
449
        self.assertBranchAnnotate('1   committ | hello\n', tree1.branch,
457
 
            'a', 'rev-1')
 
450
            'a-id', 'rev-1')
458
451
 
459
 
        to_file = BytesIO()
 
452
        to_file = StringIO()
460
453
        self.assertBranchAnnotate('2   author@ | bye\n', tree1.branch,
461
 
            'b', 'rev-2')
 
454
            'b-id', 'rev-2')
462
455
 
463
456
 
464
457
class TestReannotate(tests.TestCase):