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

[merge] from aaron

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
709
709
                            help='show from oldest to newest'),
710
710
                     'timezone', 'verbose', 
711
711
                     'show-ids', 'revision',
 
712
                     Option('line', help='format with one line per revision'),
712
713
                     'long', 
713
714
                     Option('message',
714
715
                            help='show revisions whose message matches this regexp',
715
716
                            type=str),
716
 
                     'short',]
 
717
                     Option('short', help='use moderately short format'),
 
718
                     ]
717
719
    
718
720
    def run(self, filename=None, timezone='original',
719
721
            verbose=False,
722
724
            revision=None,
723
725
            message=None,
724
726
            long=False,
725
 
            short=False):
 
727
            short=False,
 
728
            line=False):
726
729
        from bzrlib.log import log_formatter, show_log
727
730
        import codecs
728
731
        assert message is None or isinstance(message, basestring), \
763
766
        # in e.g. the default C locale.
764
767
        outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
765
768
 
766
 
        if not short:
767
 
            log_format = 'long'
768
 
        else:
 
769
        log_format = 'long'
 
770
        if short:
769
771
            log_format = 'short'
 
772
        if line:
 
773
            log_format = 'line'
770
774
        lf = log_formatter(log_format,
771
775
                           show_ids=show_ids,
772
776
                           to_file=outf,