/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

  • Committer: John Arbash Meinel
  • Date: 2005-12-24 21:03:20 UTC
  • mto: (1685.1.1 bzr-encoding)
  • mto: This revision was merged to the branch mainline in revision 1752.
  • Revision ID: john@arbash-meinel.com-20051224210320-c9ce63441ca80288
currently broken, trying to fix things up.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
955
955
            (rev2, rev1) = (rev1, rev2)
956
956
 
957
957
        output_encoding = getattr(sys.stdout, 'encoding', None)
958
 
        if output_encoding is None:
 
958
        if not output_encoding:
959
959
            output_encoding = bzrlib.user_encoding
960
 
        mutter('encoding log as %r', output_encoding)
 
960
            mutter('encoding log as bzrlib.user_encoding %r', output_encoding)
 
961
        else:
 
962
            mutter('encoding log as sys.stdout encoding %r', output_encoding)
961
963
 
962
964
        # use 'replace' so that we don't abort if trying to write out
963
965
        # in e.g. the default C locale.
978
980
                 end_revision=rev2,
979
981
                 search=message)
980
982
 
 
983
 
981
984
def get_log_format(long=False, short=False, line=False, default='long'):
982
985
    log_format = default
983
986
    if long: