Version: (using KDE KDE 3.5.0) Installed from: Compiled From Sources The attached patch and files add bzr diff file support to kompare. More information about bzr can be found here: http://www.bazaar-ng.org/ http://bazaar.canonical.com/ Thanks, Felix
Created attachment 13559 [details] gzipped tar archive of patch and new files
Hi Felix, The patch looks like it'll match anything that doesn't match the other unified diff recognisers and consider it to be a bzr diff.. then parses the header and throws away the filenames. Unless there is some special identifier to pick out bzr diffs, or special data to be extracted from their headers, I'd rather just fix up the unified diff parser to not insist on the presence of timestamps/revisions instead. (this would also fix 116637 and its duplicates) Also, could you please upload an example bzr-generated diff? I'm still not sure of exactly what they look like, and don't have a bzr repo to test with here. Cheers, J.
On Tuesday 22 November 2005 23:56, Jeff Snyder wrote: > The patch looks like it'll match anything that doesn't match the other > unified diff recognisers and consider it to be a bzr diff.. then parses the > header and throws away the filenames. Don't know what you mean exactly. BzrDiffParser is only constructed and used for parsing, if the fileformat has been recognized in Parser::determineGenerator(const QStringList&) and the BzrDiffParser passes the recognized filenames to the constructor DiffModel(const QString&, const QString&). > Unless there is some special identifier to pick out bzr diffs, or special > data to be extracted from their headers, I'd rather just fix up the unified > diff parser to not insist on the presence of timestamps/revisions instead. > (this would also fix 116637 and its duplicates) Sounds good, unless you support file renames somehow, see attached bzr diff. Felix
Created attachment 13612 [details] a bzr diff example
The comments seem to have died off suddenly here. What's the status of bzr diff support? I'd really like to see that feature added. The patch didn't (seem to) work for me though.
Kompare is being ported to KDE4 so that is where the very few resources we have are working on. But we will try to include this later on.
I don't know what is expected but it shows 3 files for me in kompare in trunk which will be 4.3. Maybe it is something i fixed recently, maybe it already worked before. Can we close this?
Closing as irreproducible then :)