Review Request: Do not force git diff output

Yannick Kiekens yannickkiekens at gmail.com
Fri Mar 30 10:24:34 UTC 2012



> On March 30, 2012, 9:16 a.m., Andreas Pakulat wrote:
> > 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.

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


- Yannick


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/104440/#review12004
-----------------------------------------------------------


On March 30, 2012, 10:24 a.m., Yannick Kiekens wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/104440/
> -----------------------------------------------------------
> 
> (Updated March 30, 2012, 10:24 a.m.)
> 
> 
> Review request for KDevelop.
> 
> 
> Description
> -------
> 
> Do not force git diff output (-g)
> follow hgrc instead
> 
> Needed to push diff to a reviewboard instance with mercurial backend
> 
> 
> Diffs
> -----
> 
>   mercurialplugin.cpp 59198e8 
> 
> Diff: http://git.reviewboard.kde.org/r/104440/diff/
> 
> 
> Testing
> -------
> 
> diff output can be changed by modifying .hgrc 
> 
> Using this patch an a mercurial project with reviewboard
> 
> 
> Thanks,
> 
> Yannick Kiekens
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kdevelop-devel/attachments/20120330/7144a884/attachment.html>


More information about the KDevelop-devel mailing list