<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/104440/">http://git.reviewboard.kde.org/r/104440/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<p style="margin-top: 0;">On March 30th, 2012, 9:16 a.m., <b>Andreas Pakulat</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;">What other formats does hg produce and does the rest of KDevelop grok these formats? Note that the diff-job might be used by various other parts in KDevelop, so changing the output format might create problems if those parts cannot understand the different formats that hg can create. This might have been the original reason why the output is forced as git-diff format, a git blame ought to tell you why it was added.</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;">By default hg outputs Unified Format like the GNU diff tools.
This means:
a rename is seen as a delete + add
empty files can't be committed
very bad binary files support
i think this patch is needed because reviewboard with a mercurial repo does not play nice with git diffs
git diffs are an extention on unified diffs so i don't expect breakage apart from the above limitations, besides hg can be configured on a per repo basis to use git diffs or not</pre>
<br />
<p>- Yannick</p>
<br />
<p>On March 30th, 2012, 10:24 a.m., Yannick Kiekens 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 Yannick Kiekens.</div>
<p style="color: grey;"><i>Updated March 30, 2012, 10:24 a.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;">Do not force git diff output (-g)
follow hgrc instead
Needed to push diff to a reviewboard instance with mercurial backend</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;">diff output can be changed by modifying .hgrc
Using this patch an a mercurial project with reviewboard</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>mercurialplugin.cpp <span style="color: grey">(59198e8)</span></li>
</ul>
<p><a href="http://git.reviewboard.kde.org/r/104440/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>