Review Request 115444: SVN plugin: Never launch configured external diff and diff3 tools.

[Milian Wolff]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/115444/#review48810
-----------------------------------------------------------

Ship it!


sounds good - do you have KDE commit rights? If not, I'll apply this patch for you.

- Milian Wolff


On Feb. 3, 2014, 10:48 a.m., Branko Čibej wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/115444/
> -----------------------------------------------------------
> 
> (Updated Feb. 3, 2014, 10:48 a.m.)
> 
> 
> Review request for KDevelop.
> 
> 
> Repository: kdevplatform
> 
> 
> Description
> -------
> 
> Yesterday I installed KDevelop for the first time (on a Mac, using Homebrew), and the first thing I tried was a patch review, using the Subversion plug-in. I have my command-line Subversion client set up to use colordiff instead of the internal diff implementation, so of course instead of seeing a nice diff in KDevelop, I got a mess of ANSI colour escape codes.
> 
> This patch disables any external diff or diff3 tools configured in the ~/.subversion/config file. It does this by modifying configuration in memory right after it is parsed from disk (or possibly the registry on Windows). This way, we can safely assume that running a diff or merge will produce unidiff format, and the config file doesn't have to be changed.
> 
> N.B., it may be necessary to override the merge-tool command (SVN_CONFIG_OPTION_MERGE_TOOL_CMD) in the same way; I haven't looked deep enough into kdevplatform to make sure one way or another.
> 
> 
> Diffs
> -----
> 
>   plugins/subversion/svndiffjob.cpp 7cd799b 
>   plugins/subversion/kdevsvncpp/context.cpp a90cdd7 
> 
> Diff: https://git.reviewboard.kde.org/r/115444/diff/
> 
> 
> Testing
> -------
> 
> Applied patch, rebuilt kdevplatform, restarted KDevelop, told it to show the diff, and all worked as expected, while the command-line client still uses colordiff.
> 
> 
> Thanks,
> 
> Branko Čibej
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kdevelop-devel/attachments/20140203/73b31ea2/attachment.html>