288131 - PatchViewer adds extra empty lines in modified parts of patches

Status: RESOLVED FIXED

(Bugzilla :: Attachments & Requests, defect)

Description

[Frédéric Buclin]

When viewing patches using PatchViewer (diff mode), added or removed parts are
displayed correctly, but modified ones are not: extra empty lines are added:

http://landfill.mozilla.org/bugzilla-tip/attachment.cgi?id=314&action=diff

I cannot reproduce on 2.18+:

http://landfill.bugzilla.org/bugzilla-2.18-branch/attachment.cgi?id=134&action=diff

Comment 1

[Max Kanat-Alexander]

If I had to guess, I'd say that it has something to do with not stripping \r, or
something...? I'd have to investigate, though, to really find out what's going on.

Comment 2

[Colin Ogilvie [:cso]]

This appeared to regress between 7 March and 8 March -- a checkout from 07 Mar
behaves correctly, but a checkout from 08 Mar demonstrates this problem.


cvs -q update -d -p -D "07 Mar 2005" webtools/bugzilla -- Fine
cvs -q update -d -p -D "08 Mar 2005" webtools/bugzilla -- Has this issue

Comment 3

[Colin Ogilvie [:cso]]

Regression caused by bug 162194 - removing the patch works, adding it doesn't...
not quite what I was expecting when I tracked this down!

Comment 4

[Frédéric Buclin]

Attachment: simple fix, v1

Comment 5

[:glob ✱]

Comment on attachment 178922 [details] [diff] [review]
simple fix, v1

r=glob

Comment 6

[Frédéric Buclin]

Regression found by me; culprit found by Colin; original fix found by glob;
additional tests made by wicked. That's what I call a great team work! :)

Comment 7

[Frédéric Buclin]

Checking in template/en/default/attachment/diff-header.html.tmpl;
/cvsroot/mozilla/webtools/bugzilla/template/en/default/attachment/diff-header.html.tmpl,v
 <--  diff-header.html.tmpl
new revision: 1.9; previous revision: 1.8
done