Error since last pull about icdiff

[jeffkaufman]

what version are you on? ./icdiff --version

[Spope]

the last one : icdiff version 1.6.4

[jeffkaufman]

What files are you diffing?

Are you using python2 or python3?

[Spope]

I use Python 2.7.6 and I diff .php files that were correctly diffed last friday

[jeffkaufman]

icdiff has new output handling to deal with #31. Reverting to the old handling would break that case, so I need to figure out how to reproduce this case so I make both work. Are these php files you can post? Or could you zip them and send them to [email protected]?

[Spope]

I tried to manually diff my php files and it works, it only fail if I use svn diff.
And sorry I can't send you those files (DMCA)

[jeffkaufman]

I got svn set up, checked out an svn repo, appended 测试行abc测试测试行abc测试测试行abc测试测试行abc测试测试行abc测试测试行abc测试测试行abc测试测试行abc测试测试行abc测试 to one of the files, ran svn diff --diff-cmd icdiff and it worked as expected:

svn co http://plugins.svn.wordpress.org/calculated-fields-form/trunk calculated-fields-form/
cd calculated-fields-form/
cat /path/to/icdiff/tests/input-1.txt  >> cp_calculatedfieldsf_admin_int.php
svn diff --diff-cmd icdiff

Could you try this as well? Either it won't work on your machine and then it's something about icdiff operating in different environments, or it will work in which case it's something about the specific encoded characters in your php file.

[Spope]

Ok, I got the exact same error, but I also tried to add a single letter or a single space and it throw the error to. Each svn diff will throw this error.

Index: cp_calculatedfieldsf_admin_int.php

Traceback (most recent call last):
  File "/bin/icdiff", line 561, in <module>
    start()
  File "/bin/icdiff", line 476, in start
    diff_files(options, a, b, options.encoding)
  File "/bin/icdiff", line 556, in diff_files
    codec_print(line, options)
  File "/bin/icdiff", line 483, in codec_print
    sys.stdout.write(s.encode(options.output_encoding))
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 44: ordinal not in range(128)

[jeffkaufman]

Thanks!

What os are you on? What kind of terminal? What does echo $LANG give you?

[Spope]

ubuntu 14.04, default terminal and fr_FR.UTF-8.
My svn conf is default too, except for diff-cmd : diff-cmd=icdiff

[jeffkaufman]

I just tried setting LANG=fr_FR.UTF-8 on a ubuntu 14.04 box, and didn't get this error. But I'm not confident I'm setting the locale correctly.

Are you saying you're seeing this error with every use of icdiff with svn, even ones that don't have any characters outside of the ascii range?

Could you try using python3?

[Spope]

Yes I have the error even with ascii character.
Same thing with python 3
(I have created an alias python=python3 into my bashrc, which give me Python 3.4.0)

[jeffkaufman]

Setting python=python3 in your bashrc won't make icdiff use python3. The easiest way to do that would be to change #!/usr/bin/env python to #!/usr/bin/env python3 at the top of icdiff.

[Spope]

Okay, with python3 it works.