~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: Martin Pool
  • Date: 2005-08-12 15:28:37 UTC
  • Revision ID: mbp@sourcefrog.net-20050812152837-9f0bee4b51498c0e
- change default log format back to long
  (looks better with -v)

Show diffs side-by-side

added added

removed removed

Lines of Context:
987
987
    """
988
988
 
989
989
    takes_args = ['filename?']
990
 
    takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision','long', 'message']
 
990
    takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision',
 
991
                     'long', 'message', 'short',]
991
992
    
992
993
    def run(self, filename=None, timezone='original',
993
994
            verbose=False,
995
996
            forward=False,
996
997
            revision=None,
997
998
            message=None,
998
 
            long=False):
 
999
            long=False,
 
1000
            short=False):
999
1001
        from bzrlib.branch import find_branch
1000
1002
        from bzrlib.log import log_formatter, show_log
1001
1003
        import codecs
1035
1037
        # in e.g. the default C locale.
1036
1038
        outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
1037
1039
 
1038
 
        if long:
 
1040
        if not short:
1039
1041
            log_format = 'long'
1040
1042
        else:
1041
1043
            log_format = 'short'
1566
1568
    'no-recurse':             None,
1567
1569
    'profile':                None,
1568
1570
    'revision':               _parse_revision_str,
 
1571
    'short':                  None,
1569
1572
    'show-ids':               None,
1570
1573
    'timezone':               str,
1571
1574
    'verbose':                None,