Author Mahmoud Al-Qudsi
Recipients Mahmoud Al-Qudsi, tim.peters
Date 2017-09-24.19:27:19
SpamBayes Score -1.0
Marked as misclassified Yes
Message-id <1506281239.96.0.255864578196.issue31561@psf.upfronthosting.co.za>
In-reply-to
Content
@tim.peters

No, `icdiff` is not part of core and probably should be omitted from the remainder of this discussion.

I just checked and it's actually not a mix of line endings in each file, it's just that one file is \n and the other is \r\n

You can actually just duplicate this bug by taking _any_ file and copying it, then executing `unix2dos file1; dos2unix file2` - you'll have to perfectly "correct" files2 that difflib will struggle to handle.

(as a preface to what follows, I've written a binary diff and incremental backup utility, so I'm familiar with the intricacies and pitfalls when it comes to diffing. I have not looked at difflib's source code, however. Looking at the documentation for difflib, it's not clear whether or not it should be considered a naive binary diffing utility, since it does seem to have the concept of "lines".)

Given that _both_ input files are "correct" without line ending errors, I think the correct optimization here would be for difflib to "realize" that two chunks are "identical" but with different line endings (aka just plain different, not asking for this to be treated as a special case) but instead of going on to search for a match to either buffer, it should assume that no better match will be found later on and simply move on to the next block/chunk.

Of course, in the event where file2 has a line from file1 that is first present with a different line ending then repeated with the same line ending, difflib will not choose the correct line.. but that's probably not something worth fretting over (like you said, mixed line endings == recipe for disaster).

Of course I can understand if all this is out of the scope of difflib and not an endeavor worth taking up.
History
Date User Action Args
2017-09-24 19:27:20Mahmoud Al-Qudsisetrecipients: + Mahmoud Al-Qudsi, tim.peters
2017-09-24 19:27:19Mahmoud Al-Qudsisetmessageid: <1506281239.96.0.255864578196.issue31561@psf.upfronthosting.co.za>
2017-09-24 19:27:19Mahmoud Al-Qudsilinkissue31561 messages
2017-09-24 19:27:19Mahmoud Al-Qudsicreate