Bug 64647 – svn-apply failed to recognize Git delta binary diff in attachment 101077 [details]

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[WebKit Review Bot]

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

[Dana Burkart]

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]

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

[Daniel Bates]

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]

(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]

Created attachment 263617 [details]
Adds unit tests.

[Dana Burkart]

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 on attachment 263643 [details]
Patch

Clearing flags on attachment: 263643

Committed r191367: <http://trac.webkit.org/changeset/191367>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.