/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/log.py

merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
60
60
    )
61
61
 
62
62
from bzrlib import (
 
63
    config,
 
64
    lazy_regex,
63
65
    registry,
64
66
    symbol_versioning,
65
67
    )
619
621
        raise NotImplementedError('not implemented in abstract base')
620
622
 
621
623
    def short_committer(self, rev):
622
 
        return re.sub('<.*@.*>', '', rev.committer).strip(' ')
 
624
        name, address = config.parse_username(rev.committer)
 
625
        if name:
 
626
            return name
 
627
        return address
623
628
 
624
629
    def short_author(self, rev):
625
 
        return re.sub('<.*@.*>', '', rev.get_apparent_author()).strip(' ')
 
630
        name, address = config.parse_username(rev.get_apparent_author())
 
631
        if name:
 
632
            return name
 
633
        return address
626
634
 
627
635
 
628
636
class LongLogFormatter(LogFormatter):