invoking external diff failed for non-ascii files
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Fix Released
|
Medium
|
Unassigned |
Bug Description
C:\Temp\4\a>bzr diff -c-1
=== modified file 'Тест.txt'
--- Тест.txt 2009-06-02 10:38:34 +0000
+++ Тест.txt 2009-06-02 10:41:44 +0000
@@ -1,1 +1,1 @@
-foo
+bar
I've set up WinMerge as external diff application. When I'm trying to run qdiff from qlog I've got error dialog with following traceback:
=== modified file 'Тест.txt'
bzr: ERROR: exceptions.
Traceback (most recent call last):
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "C:\work\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\diff.pyo", line 427, in show_diff_trees
File "bzrlib\diff.pyo", line 825, in show_diff
File "bzrlib\diff.pyo", line 885, in _show_diff
File "bzrlib\diff.pyo", line 908, in diff
File "bzrlib\diff.pyo", line 486, in _diff_many
File "bzrlib\diff.pyo", line 741, in diff
File "bzrlib\diff.pyo", line 682, in _execute
File "subprocess.pyo", line 594, in __init__
File "subprocess.pyo", line 822, in _execute_child
UnicodeEncodeError: 'ascii' codec can't encode characters in position 44-47: ordinal not in range(128)
bzr 1.15 on python 2.5.4 (win32)
arguments: ['C:\\Program Files\\
encoding: 'cp1251', fsenc: 'mbcs', lang: None
plugins:
acad C:\work\
bzrtools C:\Program Files\Bazaar\
extmerge C:\work\
fastimport C:\work\
launchpad C:\Program Files\Bazaar\
qbzr C:\work\
rebase C:\work\
scmproj C:\work\
x_bit C:\work\
*** Bazaar has encountered an internal error.
Please report a bug at https:/
including this traceback, and a description of what you
were doing when the error occurred.
Related branches
tags: | added: external-diff |
Changed in bzr: | |
importance: | Undecided → Medium |
status: | Confirmed → In Progress |
Changed in bzr: | |
milestone: | none → 1.18rc1 |
Changed in bzr: | |
status: | In Progress → Fix Released |
Please test if the following command works? If not, then this is bug with bzr, and not qbzr
bzr dif --using="C:/program files/winmerge/ winmergeu. exe" -r revid:<email address hidden>:<email address hidden>