Bug 19963
| Summary: | "$OpenBSD$" markers display in PrettyPatch, but not built-in "diff" | ||
|---|---|---|---|
| Product: | WebKit | Reporter: | David Kilzer (:ddkilzer) <ddkilzer> |
| Component: | Tools / Tests | Assignee: | Nobody <webkit-unassigned> |
| Status: | RESOLVED DUPLICATE | ||
| Severity: | Normal | CC: | aroben, cmarcelo |
| Priority: | P2 | ||
| Version: | 525.x (Safari 3.1) | ||
| Hardware: | All | ||
| OS: | All | ||
| URL: | https://bugs.webkit.org/attachment.cgi?id=22185&action=prettypatch | ||
David Kilzer (:ddkilzer)
* SUMMARY
An OpenBSD patch on Bug 19775 uses "$OpenBSD$" as a marker between file diffs. The built-in "diff" format on bugs.webkit.org does not display these lines:
https://bugs.webkit.org/attachment.cgi?id=22185&action=diff
However, PrettyPatch does display them (after skipping the first) at the end of each diff:
https://bugs.webkit.org/attachment.cgi?id=22185&action=prettypatch
I think counting the number of actual/expected lines in the patch while parsing out individual diffs may fix the issue. (Would be interesting to look at how the "diff" format does its parsing, too.)
| Attachments | ||
|---|---|---|
| Add attachment proposed patch, testcase, etc. |
David Kilzer (:ddkilzer)
Another example:
https://bugs.webkit.org/attachment.cgi?id=22203&action=prettypatch
Caio Marcelo de Oliveira Filho
David Kilzer, I think my patch for bug 29317 will solve this problem as well.
Caio Marcelo de Oliveira Filho
This is fixed now. I'm marking as duplicate of bug 29317 because it is fundamentally the same problem: displaying lines that are not part of the actual diff contents.
*** This bug has been marked as a duplicate of bug 29317 ***
David Kilzer (:ddkilzer)
(In reply to comment #2)
> David Kilzer, I think my patch for bug 29317 will solve this problem as well.
Looks good. Thanks!