Bug 64647 - svn-apply failed to recognize Git delta binary diff in attachment 101077 [details]
Summary: svn-apply failed to recognize Git delta binary diff in attachment 101077
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Dana Burkart
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-07-15 19:57 PDT by WebKit Review Bot
Modified: 2015-10-20 18:42 PDT (History)
4 users (show)

See Also:

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 an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description WebKit Review Bot 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.
Comment 1 Dana Burkart 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
Comment 2 Dana Burkart 2015-10-20 13:07:29 PDT 
Created attachment 263606 [details]
Re-create patch (get rid of git-format-patch stuff)
Comment 3 Daniel Bates 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.
Comment 4 Dana Burkart 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!
Comment 5 Dana Burkart 2015-10-20 14:32:10 PDT 
Created attachment 263617 [details]
Adds unit tests.
Comment 6 Dana Burkart 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"
Comment 7 WebKit Commit Bot 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>
Comment 8 WebKit Commit Bot 2015-10-20 18:42:36 PDT 
All reviewed patches have been landed.  Closing bug.