<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 solid;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/115444/">https://git.reviewboard.kde.org/r/115444/</a>
</td>
</tr>
</table>
<br />
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">This review has been submitted with commit 08cf0af1814d3bc34c98368d0877722110ac7dfe by Milian Wolff on behalf of Branko Čibej to branch master.</pre>
<br />
<p>- Commit Hook</p>
<br />
<p>On February 3rd, 2014, 10:48 a.m. UTC, Branko Čibej wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('https://git.reviewboard.kde.org/static/rb/images/review_request_box_top_bg.ab6f3b1072c9.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for KDevelop.</div>
<div>By Branko Čibej.</div>
<p style="color: grey;"><i>Updated Feb. 3, 2014, 10:48 a.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
kdevplatform
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">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.</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">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.</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>plugins/subversion/svndiffjob.cpp <span style="color: grey">(7cd799b)</span></li>
<li>plugins/subversion/kdevsvncpp/context.cpp <span style="color: grey">(a90cdd7)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/115444/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>