~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/ui/__init__.py

  • Committer: Robert Collins
  • Date: 2010-06-25 20:34:05 UTC
  • mto: This revision was merged to the branch mainline in revision 5324.
  • Revision ID: robertc@robertcollins.net-20100625203405-c74lxd3enklhaqf9
``bzrlib.osutils.get_terminal_encoding`` will now only mutter its
selection when explicitly requested; this avoids many duplicate calls
being logged when helpers, wrappers and older code that manually calls
it are executed it is now logged deliberately by the ui setup code.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
192
192
            encoding = config.GlobalConfig().get_user_option(
193
193
                'output_encoding')
194
194
        if encoding is None:
195
 
            encoding = osutils.get_terminal_encoding()
 
195
            encoding = osutils.get_terminal_encoding(trace=True)
196
196
        if encoding_type is None:
197
197
            encoding_type = 'replace'
198
198
        out_stream = self._make_output_stream_explicit(encoding, encoding_type)