kompare diff options are not taken into account

[moltonel]

I have configured kompare to "ignore changes in amount of whitespace". When I run it manually ("kompare file.txt .svn/text-base/file.txt.svn-base" command) it works, but not when I run it via kdesvn ("diff local changes" menu).

If I configure kdesvn to "use other diff display" with "kompare %1 %2" (instead of "use kompare for diffs"), it works as well. But that's a hard-to-find workaround.

I expected "use kompare for diffs" to let me use the compare options. I didn't check the kdesvn code, but it seems like kdesvn is sending a diff output to kompare, instead of sending two files.

ADDITIONAL INFORMATION: kdesvn 0.12.1 (but behaviour has allways been the same) kde 3.5.7 gentoo 64bit

[alwin]

Well, this is a problem of kompare I think. It has the well documented option to read diff output and display it - and kdesvn use it. It is much faster than exporting and let external programs do the diff.

But otherwise you're right - I should integrate into kdesvn such option for ignoring white spaces.

[moltonel]

AFAIK, kompare uses the diff program internally, which itself takes care of the whitespace options. So if you feed it with the diff result directly, it can't send options to diff.

Concerning speed, for the corner-case of "diff local changes", could you use the file in .svn/text-base/ instead of generating a new file ? Or are you worried that the user might accidentally modify this internal svn file ?

[alwin]

When doing the export for local changes it uses this file (eg., subversion does), eg., exporting a local working copy should always be fast.

But when diffing other revisions then working and base then external stuff slows down.

Bu in latest development this option "ignoring white spaces on diff" is integrated in kdesvn, so it will come with next minor release.