Bug 244665 - Ability to disable automatic diff/patch parsing
Summary: Ability to disable automatic diff/patch parsing
Status: CONFIRMED
Alias: None
Product: kompare
Classification: Applications
Component: parser (show other bugs)
Version: 4.0.0
Platform: FreeBSD Ports FreeBSD
: NOR normal
Target Milestone: ---
Assignee: Kompare developers
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-07-14 21:53 UTC by John Baldwin
Modified: 2018-11-05 20:32 UTC (History)
1 user (show)

See Also:
Latest Commit:
Version Fixed In:
Sentry Crash Report:


Attachments
11_irqs.txt (42.21 KB, text/plain)
2018-11-05 19:56 UTC, John Baldwin
Details
head_irqs.txt (39.30 KB, text/plain)
2018-11-05 19:56 UTC, John Baldwin
Details

Note You need to log in before you can comment on or make changes to this bug.
Description John Baldwin 2010-07-14 21:53:27 UTC
Version:           4.0.0 (using KDE 4.4.4) 
OS:                FreeBSD

I like to compare two different patch files as if they were plain text files (i.e. side by side).  Sometimes this works in kompare if I ask it to compare two patches, but sometimes it notices that the first file is a patch file and operates as if I had specified 'kompare -o firstfile'.  Even if I explicitly use 'kompare -c firstfile secondfile' or ask to compare the two files in the GUI, the parser "outsmarts" me and just displays the parsed display for the first file.  All I would really like is some sort of way to force the issue so that kompare will treat the two patch files as plain files.  If kompare -c forced this to be true or specifying two URLs vs one on the command line forced this to be true that would be nice, but even a separate command line flag to disable the automagical patch recognition would work for me.

Reproducible: Sometimes

Steps to Reproduce:
So far I have not been able to reliably figure out when kompare's automatic recognition of a patch file kicks in and when it doesn't.  Renaming the files to not have a .patch or .diff extension does not prevent the recognition.  It does seem that if I remove 'Property' change lines from 'svn diff' output so that the first line in the diff is an 'Index: /some/path' line, then kompare will treat the files as plain files.  Given that, you may be able to reproduce this by taking a diff of an svn checkout that includes property changes (e.g. after an 'svn merge' operation that creates mergeinfo), editing the file slightly and comparing that with the original diff, vs comparing two "plain" diffs that do not have property changes.


Expected Results:  
I would like to be able to kompare two diffs side-by-side.
Comment 1 Andrew Crouthamel 2018-11-05 03:13:18 UTC
Dear Bug Submitter,

This bug has been stagnant for a long time. Could you help us out and re-test if the bug is valid in the latest version? I am setting the status to NEEDSINFO pending your response, please change the Status back to REPORTED when you respond.

Thank you for helping us make KDE software even better for everyone!
Comment 2 John Baldwin 2018-11-05 19:56:02 UTC
I don't regularly run into this as often as the tree I'm using with svn doesn't have as many property diffs, but I just reproduced the weird behavior on kompare 4.1.3.  To reproduce, run 'kompare 11_irqs.txt head_irqs.txt'.  The files are output of 'svn diff -c XXXX' for a change I made in FreeBSD's head (master) branch and a later change to merge that change (and some others) to the stable/11 branch.  For 11_irqs.txt I had to edit the output of 'svn diff' to reproduce the weird behavior.  First, I had to move the diff showing a Property change (on svn:mergeinfo) from the bottom of the file to the top.  Second, I then I had to remove the 'Index: .' lines so that the first line in the file was 'Property changes on: .'.
Comment 3 John Baldwin 2018-11-05 19:56:34 UTC
Created attachment 116112 [details]
11_irqs.txt
Comment 4 John Baldwin 2018-11-05 19:56:58 UTC
Created attachment 116113 [details]
head_irqs.txt
Comment 5 Andrew Crouthamel 2018-11-05 20:32:49 UTC
Thanks for the update!