← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Alexander Belchenko
  • Date: 2007-03-11 19:39:37 UTC
  • mto: This revision was merged to the branch mainline in revision 2335.
  • Revision ID: bialix@ukr.net-20070311193937-nx38jief5kw8pp2f
external diff: no need for special code path for win32 (suggested by John Meinel)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
110
110
        path = os.environ.get('PATH')
111
111
        if path is not None:
112
112
            env['PATH'] = path
113
 
        if sys.platform == 'win32':
114
 
            # diffutils+gettext from http://gnuwin32.sf.net use only LANGUAGE
115
 
            env['LANGUAGE'] = 'C'
116
 
        else:
117
 
            env['LANG'] = 'C'
118
 
            env['LC_ALL'] = 'C'
 
113
        env['LANGUAGE'] = 'C'   # on win32 only LANGUAGE has effect
 
114
        env['LANG'] = 'C'
 
115
        env['LC_ALL'] = 'C'
119
116
        stderr = subprocess.PIPE
120
117
    else:
121
118
        env = None