← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-06-20 01:17:49 UTC
  • mfrom: (1711.4.21 win32)
  • Revision ID: pqm@pqm.ubuntu.com-20060620011749-a14183c559028aaf
(jam) misc win32 fixes (#50155), fix bundle merging

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
41
41
                           BzrOptionError,
42
42
                           NotBranchError)
43
43
from bzrlib.option import Option
 
44
import bzrlib.osutils
44
45
from bzrlib.revisionspec import RevisionSpec
45
46
from bzrlib.symbol_versioning import *
46
47
import bzrlib.trace
235
236
            self.outf = sys.stdout
236
237
            return
237
238
 
238
 
        output_encoding = getattr(sys.stdout, 'encoding', None)
239
 
        if not output_encoding:
240
 
            input_encoding = getattr(sys.stdin, 'encoding', None)
241
 
            if not input_encoding:
242
 
                output_encoding = bzrlib.user_encoding
243
 
                mutter('encoding stdout as bzrlib.user_encoding %r', output_encoding)
244
 
            else:
245
 
                output_encoding = input_encoding
246
 
                mutter('encoding stdout as sys.stdin encoding %r', output_encoding)
247
 
        else:
248
 
            mutter('encoding stdout as sys.stdout encoding %r', output_encoding)
 
239
        output_encoding = bzrlib.osutils.get_terminal_encoding()
249
240
 
250
241
        # use 'replace' so that we don't abort if trying to write out
251
242
        # in e.g. the default C locale.