Problems with mixed cp1251/cp866 content in qdiff (Failed to decode using charmap, falling back to latin1)
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
QBzr |
Fix Released
|
Medium
|
Alexander Belchenko |
Bug Description
Then use diff under Windows7, to see changes, if changes have Cyrillic letters in cp1251 codetable, the internal diff show this places with incorrect encodings. This problem is in 2.4b5 and also in the 2.3.4. Then I use external diff utils (csdiff for example) - all ok
If I change encoding to cp866 or koi8r or mac-cyrillic, I see that encoding really changes and changes correctly, but then I try cp1251 I see the incorrect encoded text again.
Here the log file for 2.4b5:
hu 2011-07-21 17:06:04 +0300
.128 bazaar version: 2.4b5
.129 bzr arguments: [u'qdiff']
.232 looking for plugins in C:/Users/
.251 looking for plugins in C:/Program Files/Bazaar/
.255 Plugin name xmloutput already loaded
.417 encoding stdout as osutils.
.053 opening working tree 'C:/Users/
6832] 2011-07-21 17:06:05.546 INFO: Failed to decode using charmap, falling back to latin1
6832] 2011-07-21 17:06:05.549 INFO: Failed to decode using charmap, falling back to latin1
6832] 2011-07-21 17:06:21.829 INFO: Failed to decode using charmap, falling back to latin1
Here the log file for 2.3.4:
Thu 2011-07-21 15:56:07 +0300
0.187 bazaar version: 2.3.4
0.187 bzr arguments: [u'qversion']
0.265 looking for plugins in C:/Users/
0.281 looking for plugins in C:/Program Files/Bazaar/
0.281 Plugin name xmloutput already loaded
0.515 encoding stdout as osutils.
11.996 return code 0
[ 2924] 2011-07-21 15:57:45.753 INFO: Failed to decode using utf8, falling back to latin1
[ 2924] 2011-07-21 15:57:45.769 INFO: Failed to decode using utf8, falling back to latin1
[ 2924] 2011-07-21 15:57:56.019 INFO: Failed to decode using utf8, falling back to latin1
In attachnent - two screenshots one for 2.3.4, one for 2.4.b5, where you can see incorrect encoding at the left (where setting cp1251 codetable), partly incorrect at the right (where setting mac-cyrillic), and correct encoding with external diff utility.
Related branches
- IWATA Hidetaka: Approve
- QBzr Developers: Pending requested
-
Diff: 109 lines (+26/-10)4 files modifiedNEWS.txt (+4/-0)
lib/diffwindow.py (+19/-7)
lib/shelvewindow.py (+0/-1)
lib/widgets/shelvelist.py (+3/-2)
Changed in qbzr: | |
milestone: | none → 0.22b1 |
Changed in qbzr: | |
assignee: | nobody → Alexander Belchenko (bialix) |
Changed in qbzr: | |
status: | Confirmed → Fix Committed |
Changed in qbzr: | |
status: | Fix Committed → Fix Released |
Sorry, I make incorrect attachment (I attach part of log file) in the previous message. Here the screenshot for 2.4b5