Bug 190724 - Parts of patches not shown via Diff link
Summary: Parts of patches not shown via Diff link
Status: Closed FIXED
Alias: None
Product: Services
Classification: Unclassified
Component: Bug Tracker (show other bugs)
Version: unspecified
Hardware: Any Any
: --- Affects Some People
Assignee: Bugmeister
URL: https://rt.cpan.org/Public/Bug/Displa...
Keywords:
Depends on: 193785
Blocks:
  Show dependency treegraph
 
Reported: 2014-06-06 18:25 UTC by Stephen Hurd
Modified: 2014-09-22 16:48 UTC (History)
5 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Stephen Hurd freebsd_committer freebsd_triage 2014-06-06 18:25:38 UTC
While marking attachments as diffs works well, it seems that the Diff viewer is confused by svn diffs and doesn't show newly added files.

See bug 190505 for an example.
Comment 1 Stephen Hurd freebsd_committer freebsd_triage 2014-06-09 00:25:00 UTC
Actually, bug 190198 has an SVN diff with new files.
Comment 2 mp39590 2014-06-16 22:26:57 UTC
I also may add, that in Diff view parts of patches for "patches" (which is usually located in files/ directory of the port) doesn't get shown. Bug 191111 is an example - if you download it - you will see that this patch touches files/patch-Makefile.in, but in html Diff view this part is not presented.
Comment 3 Kurt Jaeger freebsd_committer freebsd_triage 2014-06-20 18:15:52 UTC
Similar case with attachment #143950 [details] of bug #191101.
Comment 4 Adam Weinberger freebsd_committer freebsd_triage 2014-07-24 23:07:02 UTC
Likewise attachment #144177 [details], attachment #144432 [details], and attachment #144950 [details] of bug #191426.

It eats the patch in both side-by-side and raw diff mode. The latter is particularly odd... how is it eating parts of patches that it's displaying raw? The patch remains intact, when you access it with the attachment link itself (rather than the diff link alongside it).

Given that our bugzilla is known not to work with the "diff" link, is it worth disabling it until bugmeister can repair the problem?
Comment 6 fullermd 2014-07-29 23:41:13 UTC
Occurs also with attachment on https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=192259
Comment 7 Kalten 2014-09-11 22:04:35 UTC
Aaaand another one: Bug 193271 Attachment 147188 [details].

The new file in this patch (files/patch-xboard.conf.in) is shown in the
raw version of the attachment when clicking on the description¹⁾ as well
as when clicking on “Details”²⁾ right to it.
But it is not showing up when clicking on “Diff”³⁾.

That is annoying! Pray do correct this!

Thank you in advance,
 Kalten

¹⁾ https://bz-attachments.freebsd.org/attachment.cgi?id=147188
²⁾ https://bugs.freebsd.org/bugzilla/attachment.cgi?id=147188&action=edit
³⁾ https://bugs.freebsd.org/bugzilla/attachment.cgi?id=147188&action=diff
Comment 8 Marcus von Appen freebsd_committer freebsd_triage 2014-09-20 07:30:01 UTC
The problem is caused by devel/p5-PatchReader, which has several matcher issues in its parser. A fix is filed in bug 193785 and currently waits for approval by the maintainer.
Comment 9 Marcus von Appen freebsd_committer freebsd_triage 2014-09-20 07:32:17 UTC
Added reports from other systems for this issue.
Comment 10 commit-hook freebsd_committer freebsd_triage 2014-09-21 17:00:01 UTC
A commit references this bug:

Author: mva
Date: Sun Sep 21 16:59:00 UTC 2014
New revision: 368776
URL: http://svnweb.freebsd.org/changeset/ports/368776

Log:
  - Fix diff scan and output for new files within a non-CVS diff
  - Fix file name mangling for new files with whitespace
  - Convert line endings to unix

  This also should fix an issue in Bugzilla for patch attachments being
  truncated, if they contain new files.

  Some changes from https://rt.cpan.org/Public/Bug/Display.html?id=94181 and
  https://bugs.eclipse.org/bugs/show_bug.cgi?id=399391 were incorporated in this
  patch.

  PR:		193785, 190724
  Approved by:	toni.viemero@iki.fi (maintainer)

Changes:
  head/devel/p5-PatchReader/Makefile
  head/devel/p5-PatchReader/files/
  head/devel/p5-PatchReader/files/patch-lib__PatchReader__Raw.pm
Comment 11 Marcus von Appen freebsd_committer freebsd_triage 2014-09-21 17:02:18 UTC
The fix from bug 193785 has been committed. I'm looking for a time frame to incoprorate the fix within the Bugzilla environment, so getting this fixed might take another few days.
Comment 12 commit-hook freebsd_committer freebsd_triage 2014-09-21 21:47:16 UTC
A commit references this bug:

Author: ohauer
Date: Sun Sep 21 21:47:02 UTC 2014
New revision: 368791
URL: http://svnweb.freebsd.org/changeset/ports/368791

Log:
  - unbreak patch stage (patch does not apply because line out of range)

  PR:             193785, 190724
  Approved by:    implicit

Changes:
  head/devel/p5-PatchReader/files/patch-lib__PatchReader__Raw.pm
Comment 13 Marcus von Appen freebsd_committer freebsd_triage 2014-09-22 16:48:26 UTC
devel/p5-PatchReader was updated on the machine running Bugzilla. New files within patch attachments should be displayed correctly now.
Please reopen this issue, if you still notice a a misbehaviour