Bug 64647

Summary:

svn-apply failed to recognize Git delta binary diff in attachment 101077

Product:

WebKit

Reporter:

WebKit Review Bot <webkit.review.bot>

Component:

Tools / Tests

Assignee:

Dana Burkart <dburkart>

Status:

RESOLVED FIXED

Severity:

Normal

CC:

commit-queue, dbates, dburkart, thorton

Priority:

Version:

528+ (Nightly build)

Hardware:

Unspecified

OS:

Unspecified

Attachments:

Description	Flags
Fixes decodeBinaryPatch to decode binary diffs longer than a line	none
Re-create patch (get rid of git-format-patch stuff)	dbates: review-, dbates: commit-queue-
Adds unit tests.	none
Patch	none

WebKit Review Bot

Reported 2011-07-15 19:57:37 PDT

svn-apply failed to recognize Git delta binary diff in attachment 101077 [details] Requested by dydz on #webkit.

Attachments
Fixes decodeBinaryPatch to decode binary diffs longer than a line (2.27 KB, patch) 2015-10-20 13:03 PDT, Dana Burkart	no flags	Details Formatted Diff Diff
Re-create patch (get rid of git-format-patch stuff) (1.54 KB, patch) 2015-10-20 13:07 PDT, Dana Burkart	dbates: review- dbates: commit-queue-	Details Formatted Diff Diff
Adds unit tests. (6.74 KB, patch) 2015-10-20 14:32 PDT, Dana Burkart	no flags	Details Formatted Diff Diff
Patch (7.12 KB, patch) 2015-10-20 17:55 PDT, Dana Burkart	no flags	Details Formatted Diff Diff
Show Obsolete (3) View All Add attachment proposed patch, testcase, etc.

Dana Burkart

Comment 1 2015-10-20 13:03:26 PDT

Created attachment 263605 [details] Fixes decodeBinaryPatch to decode binary diffs longer than a line This patch fixes two bugs in decodeGitBinaryPatch: - The case where a binary diff is multiple lines long - The case where the binary diff is the last diff in the patch file

Dana Burkart

Comment 2 2015-10-20 13:07:29 PDT

Created attachment 263606 [details] Re-create patch (get rid of git-format-patch stuff)

Daniel Bates

Comment 3 2015-10-20 13:15:30 PDT

Comment on attachment 263606 [details] Re-create patch (get rid of git-format-patch stuff) Please add a unit test for this change. The perl unit tests are in Tools/Scripts/webkitperl/VCSUtils_unittest. You can run them by running the script Tools/Scripts/test-webkitperl.

Dana Burkart

Comment 4 2015-10-20 13:17:29 PDT

(In reply to comment #3) > Comment on attachment 263606 [details] > Re-create patch (get rid of git-format-patch stuff) > > Please add a unit test for this change. The perl unit tests are in > Tools/Scripts/webkitperl/VCSUtils_unittest. You can run them by running the > script Tools/Scripts/test-webkitperl. Oh, cool, didn't know we had unit tests for this. Will do!

Dana Burkart

Comment 5 2015-10-20 14:32:10 PDT

Created attachment 263617 [details] Adds unit tests.

Dana Burkart

Comment 6 2015-10-20 17:55:20 PDT

Created attachment 263643 [details] Patch Fix feedback given by Dan Bates, there was no typo, we only needed to look for the "-- \n" as well as "\Z"

WebKit Commit Bot

Comment 7 2015-10-20 18:42:33 PDT

Comment on attachment 263643 [details] Patch Clearing flags on attachment: 263643 Committed r191367: <http://trac.webkit.org/changeset/191367>

WebKit Commit Bot

Comment 8 2015-10-20 18:42:36 PDT

All reviewed patches have been landed. Closing bug.

Note You need to log in before you can comment on or make changes to this bug.