<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="http://git.reviewboard.kde.org/r/105856/">http://git.reviewboard.kde.org/r/105856/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<p style="margin-top: 0;">On August 31st, 2012, 5:50 p.m., <b>Adrián Chaves Fernández</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Ok, I have no idea why the those chunks failed. Anyone else does?</pre>
</blockquote>
</blockquote>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">"git diff -b" (and "git diff --ignore-space-at-eol") sometimes produces inappliable patches...
Try to diff as usual, and then execute sed -re "s|^(\+.*)[[:space:]]+$|\1|" -i your_patch_file. It will trim whitespaces in lines that _you_ introduced.
Also, if you need (somewhy) to skip individual lines from your commit, I find "git-cola" useful: reset to HEAD^, then run the said utility and stage individual hunks/lines.</pre>
<br />
<p>- Ivan</p>
<br />
<p>On August 31st, 2012, 5:47 p.m., Adrián Chaves Fernández wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('http://git.reviewboard.kde.org/media/rb/images/review_request_box_top_bg.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for KDevelop.</div>
<div>By Adrián Chaves Fernández.</div>
<p style="color: grey;"><i>Updated Aug. 31, 2012, 5:47 p.m.</i></p>
<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;">I got the Find In Files dialog to allow the user to specify a level of depth for the search instead of just whether it should use full depth (recursion) or none (no recursion).
This is meant to be my first step in the implementation of Find In Files for (current file and) Included Files (https://bugs.kde.org/show_bug.cgi?id=160143). Just in case I give up with the task before I finish the whole of it, I figured out it would be better to at least send you this bit now, since it is already an enhancement over the current behavior.</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;">I have tested the feature by looking in “kdevplatform” for ‘All Open’ (as in “All Open Files”, one of the optiona locations for Find In Files). I tried with the following depths: Full (-1), 0, 1, 2. Only the first one and the last one gave me a match, for the file kdevplatform(0)/plugins(1)/grepview(2)/grepdialog.cpp.
I did not write an automated test for the feature, although I did updated the current tests so the changes do not break it.
Since the current tests do not actually test for different recursion values (only recursion=true), I didn’t feel like spending time on testing the change (specially since I have never written one in C++/Qt before). But if it were considered a requirement to apply the patch, I would give it a try.</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/grepview/grepdialog.h <span style="color: grey">(d4a1db6)</span></li>
<li>plugins/grepview/grepdialog.cpp <span style="color: grey">(d1f4bf7)</span></li>
<li>plugins/grepview/grepfindthread.h <span style="color: grey">(b24520c)</span></li>
<li>plugins/grepview/grepfindthread.cpp <span style="color: grey">(bc39d87)</span></li>
<li>plugins/grepview/grepjob.h <span style="color: grey">(c357b77)</span></li>
<li>plugins/grepview/grepjob.cpp <span style="color: grey">(66df1a9)</span></li>
<li>plugins/grepview/grepwidget.ui <span style="color: grey">(94cfb00)</span></li>
<li>plugins/grepview/tests/findreplacetest.cpp <span style="color: grey">(ac0687d)</span></li>
</ul>
<p><a href="http://git.reviewboard.kde.org/r/105856/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>