← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/ui/__init__.py

  • Committer: Vincent Ladeuil
  • Date: 2010-06-29 16:21:13 UTC
  • mfrom: (5325 +trunk)
  • mto: (5247.1.12 first-try)
  • mto: This revision was merged to the branch mainline in revision 5326.
  • Revision ID: v.ladeuil+lp@free.fr-20100629162113-xa6y33u17mfi024v
Merge bzr.dev into cleanup resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/ui/__init__.py
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)