← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_log.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-11-04 18:51:39 UTC
  • mfrom: (2961.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20071104185139-kaio3sneodg2kp71
Authentication ring implementation (read-only)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_log.py
17
17
import os
18
18
from cStringIO import StringIO
19
19
 
20
 
from bzrlib import log, registry
 
20
from bzrlib import log
21
21
from bzrlib.tests import TestCase, TestCaseWithTransport
22
22
from bzrlib.log import (show_log,
23
23
                        get_view_revisions,
27
27
                        ShortLogFormatter,
28
28
                        LineLogFormatter)
29
29
from bzrlib.branch import Branch
30
 
from bzrlib.errors import (
31
 
    BzrCommandError,
32
 
    InvalidRevisionNumber,
33
 
    )
 
30
from bzrlib.errors import InvalidRevisionNumber
34
31
from bzrlib.revision import Revision
35
 
from bzrlib.revisionspec import (
36
 
    RevisionInfo,
37
 
    RevisionSpec,
38
 
    )
39
 
 
40
 
 
41
 
class TestCaseWithoutPropsHandler(TestCaseWithTransport):
42
 
 
43
 
    def setUp(self):
44
 
        super(TestCaseWithoutPropsHandler, self).setUp()
45
 
        # keep a reference to the "current" custom prop. handler registry
46
 
        self.properties_handler_registry = \
47
 
            log.properties_handler_registry
48
 
        # clean up the registry in log
49
 
        log.properties_handler_registry = registry.Registry()
50
 
        
51
 
    def _cleanup(self):
52
 
        super(TestCaseWithoutPropsHandler, self)._cleanup()
53
 
        # restore the custom properties handler registry
54
 
        log.properties_handler_registry = \
55
 
            self.properties_handler_registry
56
32
 
57
33
 
58
34
class LogCatcher(LogFormatter):
218
194
        d = logentry.delta
219
195
        self.checkDelta(d, added=['file1', 'file2'])
220
196
 
221
 
    def test_merges_nonsupporting_formatter(self):
222
 
        """Tests that show_log will raise if the formatter doesn't
223
 
        support merge revisions."""
224
 
        wt = self.make_branch_and_memory_tree('.')
225
 
        wt.lock_write()
226
 
        try:
227
 
            wt.add('')
228
 
            wt.commit('rev-1', rev_id='rev-1',
229
 
                      timestamp=1132586655, timezone=36000,
230
 
                      committer='Joe Foo <joe@foo.com>')
231
 
            wt.commit('rev-merged', rev_id='rev-2a',
232
 
                      timestamp=1132586700, timezone=36000,
233
 
                      committer='Joe Foo <joe@foo.com>')
234
 
            wt.set_parent_ids(['rev-1', 'rev-2a'])
235
 
            wt.branch.set_last_revision_info(1, 'rev-1')
236
 
            wt.commit('rev-2', rev_id='rev-2b',
237
 
                      timestamp=1132586800, timezone=36000,
238
 
                      committer='Joe Foo <joe@foo.com>')
239
 
            logfile = self.make_utf8_encoded_stringio()
240
 
            formatter = ShortLogFormatter(to_file=logfile)
241
 
            wtb = wt.branch
242
 
            lf = LogCatcher()
243
 
            revspec = RevisionSpec.from_string('1.1.1')
244
 
            rev = revspec.in_history(wtb)
245
 
            self.assertRaises(BzrCommandError, show_log, wtb, lf,
246
 
                              start_revision=rev, end_revision=rev)
247
 
        finally:
248
 
            wt.unlock()
249
 
 
250
197
 
251
198
def make_commits_with_trailing_newlines(wt):
252
199
    """Helper method for LogFormatter tests"""    
272
219
    return b
273
220
 
274
221
 
275
 
def normalize_log(log):
276
 
    """Replaces the variable lines of logs with fixed lines"""
277
 
    author = 'author: Dolor Sit <test@example.com>'
278
 
    committer = 'committer: Lorem Ipsum <test@example.com>'
279
 
    lines = log.splitlines(True)
280
 
    for idx,line in enumerate(lines):
281
 
        stripped_line = line.lstrip()
282
 
        indent = ' ' * (len(line) - len(stripped_line))
283
 
        if stripped_line.startswith('author:'):
284
 
            lines[idx] = indent + author + '\n'
285
 
        elif stripped_line.startswith('committer:'):
286
 
            lines[idx] = indent + committer + '\n'
287
 
        elif stripped_line.startswith('timestamp:'):
288
 
            lines[idx] = indent + 'timestamp: Just now\n'
289
 
    return ''.join(lines)
290
 
 
291
 
 
292
222
class TestShortLogFormatter(TestCaseWithTransport):
293
223
 
294
224
    def test_trailing_newlines(self):
297
227
        sio = self.make_utf8_encoded_stringio()
298
228
        lf = ShortLogFormatter(to_file=sio)
299
229
        show_log(b, lf)
300
 
        self.assertEqualDiff(sio.getvalue(), """\
 
230
        self.assertEquals(sio.getvalue(), """\
301
231
    3 Joe Foo\t2005-11-21
302
232
      single line with trailing newline
303
233
 
311
241
 
312
242
""")
313
243
 
314
 
    def test_short_log_with_merges(self):
315
 
        wt = self.make_branch_and_memory_tree('.')
316
 
        wt.lock_write()
317
 
        try:
318
 
            wt.add('')
319
 
            wt.commit('rev-1', rev_id='rev-1',
320
 
                      timestamp=1132586655, timezone=36000,
321
 
                      committer='Joe Foo <joe@foo.com>')
322
 
            wt.commit('rev-merged', rev_id='rev-2a',
323
 
                      timestamp=1132586700, timezone=36000,
324
 
                      committer='Joe Foo <joe@foo.com>')
325
 
            wt.set_parent_ids(['rev-1', 'rev-2a'])
326
 
            wt.branch.set_last_revision_info(1, 'rev-1')
327
 
            wt.commit('rev-2', rev_id='rev-2b',
328
 
                      timestamp=1132586800, timezone=36000,
329
 
                      committer='Joe Foo <joe@foo.com>')
330
 
            logfile = self.make_utf8_encoded_stringio()
331
 
            formatter = ShortLogFormatter(to_file=logfile)
332
 
            show_log(wt.branch, formatter)
333
 
            self.assertEqualDiff(logfile.getvalue(), """\
334
 
    2 Joe Foo\t2005-11-22 [merge]
335
 
      rev-2
336
 
 
337
 
    1 Joe Foo\t2005-11-22
338
 
      rev-1
339
 
 
340
 
""")
341
 
        finally:
342
 
            wt.unlock()
343
 
 
344
 
    def test_short_log_single_merge_revision(self):
345
 
        wt = self.make_branch_and_memory_tree('.')
346
 
        wt.lock_write()
347
 
        try:
348
 
            wt.add('')
349
 
            wt.commit('rev-1', rev_id='rev-1',
350
 
                      timestamp=1132586655, timezone=36000,
351
 
                      committer='Joe Foo <joe@foo.com>')
352
 
            wt.commit('rev-merged', rev_id='rev-2a',
353
 
                      timestamp=1132586700, timezone=36000,
354
 
                      committer='Joe Foo <joe@foo.com>')
355
 
            wt.set_parent_ids(['rev-1', 'rev-2a'])
356
 
            wt.branch.set_last_revision_info(1, 'rev-1')
357
 
            wt.commit('rev-2', rev_id='rev-2b',
358
 
                      timestamp=1132586800, timezone=36000,
359
 
                      committer='Joe Foo <joe@foo.com>')
360
 
            logfile = self.make_utf8_encoded_stringio()
361
 
            formatter = ShortLogFormatter(to_file=logfile)
362
 
            revspec = RevisionSpec.from_string('1.1.1')
363
 
            wtb = wt.branch
364
 
            rev = revspec.in_history(wtb)
365
 
            show_log(wtb, formatter, start_revision=rev, end_revision=rev)
366
 
            self.assertEqualDiff(logfile.getvalue(), """\
367
 
1.1.1 Joe Foo\t2005-11-22
368
 
      rev-merged
369
 
 
370
 
""")
371
 
        finally:
372
 
            wt.unlock()
373
 
 
374
 
 
375
 
class TestLongLogFormatter(TestCaseWithoutPropsHandler):
 
244
 
 
245
class TestLongLogFormatter(TestCaseWithTransport):
 
246
 
 
247
    def normalize_log(self,log):
 
248
        """Replaces the variable lines of logs with fixed lines"""
 
249
        author = 'author: Dolor Sit <test@example.com>'
 
250
        committer = 'committer: Lorem Ipsum <test@example.com>'
 
251
        lines = log.splitlines(True)
 
252
        for idx,line in enumerate(lines):
 
253
            stripped_line = line.lstrip()
 
254
            indent = ' ' * (len(line) - len(stripped_line))
 
255
            if stripped_line.startswith('author:'):
 
256
                lines[idx] = indent + author + '\n'
 
257
            elif stripped_line.startswith('committer:'):
 
258
                lines[idx] = indent + committer + '\n'
 
259
            elif stripped_line.startswith('timestamp:'):
 
260
                lines[idx] = indent + 'timestamp: Just now\n'
 
261
        return ''.join(lines)
376
262
 
377
263
    def test_verbose_log(self):
378
264
        """Verbose log includes changed files
425
311
        sio = self.make_utf8_encoded_stringio()
426
312
        lf = LongLogFormatter(to_file=sio)
427
313
        show_log(b, lf, verbose=True)
428
 
        log = normalize_log(sio.getvalue())
429
 
        self.assertEqualDiff(log, """\
 
314
        log = self.normalize_log(sio.getvalue())
 
315
        self.assertEqualDiff("""\
430
316
------------------------------------------------------------
431
317
revno: 2
432
318
committer: Lorem Ipsum <test@example.com>
442
328
    message:
443
329
      merge branch 2
444
330
        ------------------------------------------------------------
445
 
        revno: 1.2.1
 
331
        revno: 1.1.1.1.1
446
332
        committer: Lorem Ipsum <test@example.com>
447
333
        branch nick: smallerchild
448
334
        timestamp: Just now
462
348
timestamp: Just now
463
349
message:
464
350
  first post
465
 
""")
 
351
""", log)
466
352
 
467
353
    def test_verbose_merge_revisions_contain_deltas(self):
468
354
        wt = self.make_branch_and_tree('parent')
481
367
        sio = self.make_utf8_encoded_stringio()
482
368
        lf = LongLogFormatter(to_file=sio)
483
369
        show_log(b, lf, verbose=True)
484
 
        log = normalize_log(sio.getvalue())
485
 
        self.assertEqualDiff(log, """\
 
370
        log = self.normalize_log(sio.getvalue())
 
371
        self.assertEqualDiff("""\
486
372
------------------------------------------------------------
487
373
revno: 2
488
374
committer: Lorem Ipsum <test@example.com>
515
401
added:
516
402
  f1
517
403
  f2
518
 
""")
 
404
""", log)
519
405
 
520
406
    def test_trailing_newlines(self):
521
407
        wt = self.make_branch_and_tree('.')
578
464
  add a
579
465
''')
580
466
 
581
 
    def test_properties_in_log(self):
582
 
        """Log includes the custom properties returned by the registered 
583
 
        handlers.
584
 
        """
585
 
        wt = self.make_branch_and_tree('.')
586
 
        b = wt.branch
587
 
        self.build_tree(['a'])
588
 
        wt.add('a')
589
 
        b.nick = 'test_properties_in_log'
590
 
        wt.commit(message='add a',
591
 
                  timestamp=1132711707,
592
 
                  timezone=36000,
593
 
                  committer='Lorem Ipsum <test@example.com>',
594
 
                  author='John Doe <jdoe@example.com>')
595
 
        sio = StringIO()
596
 
        formatter = LongLogFormatter(to_file=sio)
597
 
        try:
598
 
            def trivial_custom_prop_handler(revision):
599
 
                return {'test_prop':'test_value'}
600
 
            
601
 
            log.properties_handler_registry.register(
602
 
                'trivial_custom_prop_handler', 
603
 
                trivial_custom_prop_handler)
604
 
            show_log(b, formatter)
605
 
        finally:
606
 
            log.properties_handler_registry.remove(
607
 
                'trivial_custom_prop_handler')
608
 
            self.assertEqualDiff(sio.getvalue(), '''\
609
 
------------------------------------------------------------
610
 
revno: 1
611
 
test_prop: test_value
612
 
author: John Doe <jdoe@example.com>
613
 
committer: Lorem Ipsum <test@example.com>
614
 
branch nick: test_properties_in_log
615
 
timestamp: Wed 2005-11-23 12:08:27 +1000
616
 
message:
617
 
  add a
618
 
''')
619
 
 
620
 
    def test_error_in_properties_handler(self):
621
 
        """Log includes the custom properties returned by the registered 
622
 
        handlers.
623
 
        """
624
 
        wt = self.make_branch_and_tree('.')
625
 
        b = wt.branch
626
 
        self.build_tree(['a'])
627
 
        wt.add('a')
628
 
        b.nick = 'test_author_log'
629
 
        wt.commit(message='add a',
630
 
                  timestamp=1132711707,
631
 
                  timezone=36000,
632
 
                  committer='Lorem Ipsum <test@example.com>',
633
 
                  author='John Doe <jdoe@example.com>',
634
 
                  revprops={'first_prop':'first_value'})
635
 
        sio = StringIO()
636
 
        formatter = LongLogFormatter(to_file=sio)
637
 
        try:
638
 
            def trivial_custom_prop_handler(revision):
639
 
                raise StandardError("a test error")
640
 
            
641
 
            log.properties_handler_registry.register(
642
 
                'trivial_custom_prop_handler', 
643
 
                trivial_custom_prop_handler)
644
 
            self.assertRaises(StandardError, show_log, b, formatter,)
645
 
        finally:
646
 
            log.properties_handler_registry.remove(
647
 
                'trivial_custom_prop_handler')
648
 
                
649
 
    def test_properties_handler_bad_argument(self):
650
 
        wt = self.make_branch_and_tree('.')
651
 
        b = wt.branch
652
 
        self.build_tree(['a'])
653
 
        wt.add('a')
654
 
        b.nick = 'test_author_log'
655
 
        wt.commit(message='add a',
656
 
                  timestamp=1132711707,
657
 
                  timezone=36000,
658
 
                  committer='Lorem Ipsum <test@example.com>',
659
 
                  author='John Doe <jdoe@example.com>',
660
 
                  revprops={'a_prop':'test_value'})
661
 
        sio = StringIO()
662
 
        formatter = LongLogFormatter(to_file=sio)
663
 
        try:
664
 
            def bad_argument_prop_handler(revision):
665
 
                return {'custom_prop_name':revision.properties['a_prop']}
666
 
                
667
 
            log.properties_handler_registry.register(
668
 
                'bad_argument_prop_handler', 
669
 
                bad_argument_prop_handler)
670
 
            
671
 
            self.assertRaises(AttributeError, formatter.show_properties, 
672
 
                'a revision', '')
673
 
            
674
 
            revision = b.repository.get_revision(b.last_revision())
675
 
            formatter.show_properties(revision, '')
676
 
            self.assertEqualDiff(sio.getvalue(),
677
 
                '''custom_prop_name: test_value\n''')
678
 
        finally:
679
 
            log.properties_handler_registry.remove(
680
 
                'bad_argument_prop_handler')
681
467
 
682
468
 
683
469
class TestLineLogFormatter(TestCaseWithTransport):
692
478
        self.build_tree(['a'])
693
479
        wt.add('a')
694
480
        b.nick = 'test-line-log'
695
 
        wt.commit(message='add a',
696
 
                  timestamp=1132711707,
 
481
        wt.commit(message='add a', 
 
482
                  timestamp=1132711707, 
697
483
                  timezone=36000,
698
484
                  committer='Line-Log-Formatter Tester <test@line.log>')
699
485
        logfile = file('out.tmp', 'w+')
702
488
        logfile.flush()
703
489
        logfile.seek(0)
704
490
        log_contents = logfile.read()
705
 
        self.assertEqualDiff(log_contents,
706
 
            '1: Line-Log-Formatte... 2005-11-23 add a\n')
 
491
        self.assertEqualDiff(log_contents, '1: Line-Log-Formatte... 2005-11-23 add a\n')
 
492
 
 
493
    def test_short_log_with_merges(self):
 
494
        wt = self.make_branch_and_memory_tree('.')
 
495
        wt.lock_write()
 
496
        try:
 
497
            wt.add('')
 
498
            wt.commit('rev-1', rev_id='rev-1',
 
499
                      timestamp=1132586655, timezone=36000,
 
500
                      committer='Joe Foo <joe@foo.com>')
 
501
            wt.commit('rev-merged', rev_id='rev-2a',
 
502
                      timestamp=1132586700, timezone=36000,
 
503
                      committer='Joe Foo <joe@foo.com>')
 
504
            wt.set_parent_ids(['rev-1', 'rev-2a'])
 
505
            wt.branch.set_last_revision_info(1, 'rev-1')
 
506
            wt.commit('rev-2', rev_id='rev-2b',
 
507
                      timestamp=1132586800, timezone=36000,
 
508
                      committer='Joe Foo <joe@foo.com>')
 
509
            logfile = self.make_utf8_encoded_stringio()
 
510
            formatter = ShortLogFormatter(to_file=logfile)
 
511
            show_log(wt.branch, formatter)
 
512
            logfile.flush()
 
513
            self.assertEqualDiff("""\
 
514
    2 Joe Foo\t2005-11-22 [merge]
 
515
      rev-2
 
516
 
 
517
    1 Joe Foo\t2005-11-22
 
518
      rev-1
 
519
 
 
520
""", logfile.getvalue())
 
521
        finally:
 
522
            wt.unlock()
707
523
 
708
524
    def test_trailing_newlines(self):
709
525
        wt = self.make_branch_and_tree('.')
717
533
1: Joe Foo 2005-11-21 simple log message
718
534
""")
719
535
 
720
 
    def test_line_log_single_merge_revision(self):
721
 
        wt = self.make_branch_and_memory_tree('.')
722
 
        wt.lock_write()
723
 
        try:
724
 
            wt.add('')
725
 
            wt.commit('rev-1', rev_id='rev-1',
726
 
                      timestamp=1132586655, timezone=36000,
727
 
                      committer='Joe Foo <joe@foo.com>')
728
 
            wt.commit('rev-merged', rev_id='rev-2a',
729
 
                      timestamp=1132586700, timezone=36000,
730
 
                      committer='Joe Foo <joe@foo.com>')
731
 
            wt.set_parent_ids(['rev-1', 'rev-2a'])
732
 
            wt.branch.set_last_revision_info(1, 'rev-1')
733
 
            wt.commit('rev-2', rev_id='rev-2b',
734
 
                      timestamp=1132586800, timezone=36000,
735
 
                      committer='Joe Foo <joe@foo.com>')
736
 
            logfile = self.make_utf8_encoded_stringio()
737
 
            formatter = LineLogFormatter(to_file=logfile)
738
 
            revspec = RevisionSpec.from_string('1.1.1')
739
 
            wtb = wt.branch
740
 
            rev = revspec.in_history(wtb)
741
 
            show_log(wtb, formatter, start_revision=rev, end_revision=rev)
742
 
            self.assertEqualDiff(logfile.getvalue(), """\
743
 
1.1.1: Joe Foo 2005-11-22 rev-merged
744
 
""")
745
 
        finally:
746
 
            wt.unlock()
747
 
 
748
 
 
749
536
 
750
537
class TestGetViewRevisions(TestCaseWithTransport):
751
538
 
791
578
        full_rev_nos_for_reference = {
792
579
            '1': '1',
793
580
            '2': '2',
794
 
            '3a': '2.1.1', #first commit tree 3
795
 
            '3b': '2.2.1', # first commit tree 2
 
581
            '3a': '2.2.1', #first commit tree 3
 
582
            '3b': '2.1.1', # first commit tree 2
796
583
            '3c': '3', #merges 3b to main
797
 
            '4a': '2.2.2', # second commit tree 2
 
584
            '4a': '2.1.2', # second commit tree 2
798
585
            '4b': '4', # merges 4a to main
799
586
            }
800
587
        return mainline_revs, rev_nos, wt
802
589
    def test_get_view_revisions_forward(self):
803
590
        """Test the get_view_revisions method"""
804
591
        mainline_revs, rev_nos, wt = self.make_tree_with_commits()
805
 
        wt.lock_read()
806
 
        self.addCleanup(wt.unlock)
807
592
        revisions = list(get_view_revisions(mainline_revs, rev_nos, wt.branch,
808
593
                                            'forward'))
809
594
        self.assertEqual([('1', '1', 0), ('2', '2', 0), ('3', '3', 0)],
815
600
    def test_get_view_revisions_reverse(self):
816
601
        """Test the get_view_revisions with reverse"""
817
602
        mainline_revs, rev_nos, wt = self.make_tree_with_commits()
818
 
        wt.lock_read()
819
 
        self.addCleanup(wt.unlock)
820
603
        revisions = list(get_view_revisions(mainline_revs, rev_nos, wt.branch,
821
604
                                            'reverse'))
822
605
        self.assertEqual([('3', '3', 0), ('2', '2', 0), ('1', '1', 0), ],
828
611
    def test_get_view_revisions_merge(self):
829
612
        """Test get_view_revisions when there are merges"""
830
613
        mainline_revs, rev_nos, wt = self.make_tree_with_merges()
831
 
        wt.lock_read()
832
 
        self.addCleanup(wt.unlock)
833
614
        revisions = list(get_view_revisions(mainline_revs, rev_nos, wt.branch,
834
615
                                            'forward'))
835
616
        self.assertEqual([('1', '1', 0), ('2', '2', 0), ('3', '3', 0),
844
625
    def test_get_view_revisions_merge_reverse(self):
845
626
        """Test get_view_revisions in reverse when there are merges"""
846
627
        mainline_revs, rev_nos, wt = self.make_tree_with_merges()
847
 
        wt.lock_read()
848
 
        self.addCleanup(wt.unlock)
849
628
        revisions = list(get_view_revisions(mainline_revs, rev_nos, wt.branch,
850
629
                                            'reverse'))
851
630
        self.assertEqual([('4b', '4', 0), ('4a', '3.1.1', 1),
860
639
    def test_get_view_revisions_merge2(self):
861
640
        """Test get_view_revisions when there are merges"""
862
641
        mainline_revs, rev_nos, wt = self.make_tree_with_many_merges()
863
 
        wt.lock_read()
864
 
        self.addCleanup(wt.unlock)
865
642
        revisions = list(get_view_revisions(mainline_revs, rev_nos, wt.branch,
866
643
                                            'forward'))
867
644
        expected = [('1', '1', 0), ('2', '2', 0), ('3c', '3', 0),
868
 
            ('3a', '2.1.1', 1), ('3b', '2.2.1', 1), ('4b', '4', 0),
869
 
            ('4a', '2.2.2', 1)]
 
645
            ('3a', '2.2.1', 1), ('3b', '2.1.1', 1), ('4b', '4', 0),
 
646
            ('4a', '2.1.2', 1)]
870
647
        self.assertEqual(expected, revisions)
871
648
        revisions = list(get_view_revisions(mainline_revs, rev_nos, wt.branch,
872
649
                                             'forward', include_merges=False))
1008
785
        # f3 should be marked as modified by revisions A, B, C, and D
1009
786
        self.assertAllRevisionsForFileID(tree, 'f2-id', ['D', 'C', 'A'])
1010
787
 
1011
 
    def test_file_id_with_ghosts(self):
1012
 
        # This is testing bug #209948, where having a ghost would cause
1013
 
        # _filter_revisions_touching_file_id() to fail.
1014
 
        tree = self.create_tree_with_single_merge()
1015
 
        # We need to add a revision, so switch back to a write-locked tree
1016
 
        tree.unlock()
1017
 
        tree.lock_write()
1018
 
        first_parent = tree.last_revision()
1019
 
        tree.set_parent_ids([first_parent, 'ghost-revision-id'])
1020
 
        self.build_tree_contents([('tree/f1', 'A\nB\nXX\n')])
1021
 
        tree.commit('commit with a ghost', rev_id='XX')
1022
 
        self.assertAllRevisionsForFileID(tree, 'f1-id', ['XX', 'B', 'A'])
1023
 
        self.assertAllRevisionsForFileID(tree, 'f2-id', ['D', 'C', 'A'])
1024
 
 
1025
788
 
1026
789
class TestShowChangedRevisions(TestCaseWithTransport):
1027
790
 
1043
806
        rev.committer = 'John Doe <jdoe@example.com>'
1044
807
        lf = LogFormatter(None)
1045
808
        self.assertEqual('John Doe', lf.short_committer(rev))
1046
 
        rev.committer = 'John Smith <jsmith@example.com>'
1047
 
        self.assertEqual('John Smith', lf.short_committer(rev))
1048
 
        rev.committer = 'John Smith'
1049
 
        self.assertEqual('John Smith', lf.short_committer(rev))
1050
 
        rev.committer = 'jsmith@example.com'
1051
 
        self.assertEqual('jsmith@example.com', lf.short_committer(rev))
1052
 
        rev.committer = '<jsmith@example.com>'
1053
 
        self.assertEqual('jsmith@example.com', lf.short_committer(rev))
1054
 
        rev.committer = 'John Smith jsmith@example.com'
1055
 
        self.assertEqual('John Smith', lf.short_committer(rev))
1056
809
 
1057
810
    def test_short_author(self):
1058
811
        rev = Revision('a-id')
1061
814
        self.assertEqual('John Doe', lf.short_author(rev))
1062
815
        rev.properties['author'] = 'John Smith <jsmith@example.com>'
1063
816
        self.assertEqual('John Smith', lf.short_author(rev))
1064
 
        rev.properties['author'] = 'John Smith'
1065
 
        self.assertEqual('John Smith', lf.short_author(rev))
1066
 
        rev.properties['author'] = 'jsmith@example.com'
1067
 
        self.assertEqual('jsmith@example.com', lf.short_author(rev))
1068
 
        rev.properties['author'] = '<jsmith@example.com>'
1069
 
        self.assertEqual('jsmith@example.com', lf.short_author(rev))
1070
 
        rev.properties['author'] = 'John Smith jsmith@example.com'
1071
 
        self.assertEqual('John Smith', lf.short_author(rev))