Bug #28944 for Text-Diff-Parser: "---" style diffs without a "diff -u" header don't track filename1 properly

Wed Aug 22 19:16:48 2007 mkanat [...] bugzilla.org - Ticket created

Subject:	"---" style diffs without a "diff -u" header don't track filename1 properly
Date:	Wed, 22 Aug 2007 16:16:22 -0700
To:	bug-Text-Diff-Parser [...] rt.cpan.org
From:	Max Kanat-Alexander <mkanat [...] bugzilla.org>

Mercurial generates patches that have "---" and "+++" headers, but no "diff -u file1 file2" header. Text::Diff::Parser doesn't seem to update the filename1 properly in this case. It's always the filename1 of the very first file in the patch. Here's a sample patch that triggers this bug: http://hg.intevation.org/roundup/fast/rev/9ac3672df4ee/?style=raw And attached is a script that proves the bug, provided that the above diff is put into a file called "diff". -Max -- http://www.everythingsolved.com/ Competent, Friendly Bugzilla Services. And Everything Else, too.

Message body is not shown because sender requested not to inline it.

Wed Sep 05 15:17:57 2007 perl [...] pied.nu - Correspondence added

From:

perl [...] pied.nu

Version 0.07 has just been uploaded, fixing this. The problem is multiple files w/o the diff file1 file2 line. I've used the diff you pointed to as a test case and fixed Parser.pm. Thank you for your bug report!

Wed Sep 05 15:18:03 2007 The RT System itself - Status changed from 'new' to 'open'

Wed Sep 05 15:18:29 2007 perl [...] pied.nu - Correspondence added

Fixed in 0.07

Wed Sep 05 15:18:35 2007 perl [...] pied.nu - Status changed from 'open' to 'resolved'

Wed Sep 05 16:57:46 2007 mkanat [...] cpan.org - Correspondence added

From:

mkanat [...] cpan.org

Thank you so much for this, it will help a lot in VCI. :-) If I run into other problems like this with other VCSes, I'll let you know! :-) -Max On Wed Sep 05 15:17:57 2007, GWYN wrote: Show quoted text

> Version 0.07 has just been uploaded, fixing this. > > The problem is multiple files w/o the diff file1 file2 line. I've used > the diff you pointed to as a test case and fixed Parser.pm. > > Thank you for your bug report!

Wed Sep 05 16:57:49 2007 The RT System itself - Status changed from 'resolved' to 'open'

Wed Sep 05 16:59:01 2007 mkanat [...] cpan.org - Correspondence added

Ah, didn't realize RT would re-open this if I commented. I'm sorry.

Wed Sep 05 17:15:11 2007 perl [...] pied.nu - Correspondence added

Stay closed!

Wed Sep 05 17:15:14 2007 perl [...] pied.nu - Status changed from 'open' to 'resolved'