[Webkit-unassigned] [Bug 38320] New: svn-apply: Add an "isBinary" property to the hashes returned by parseDiff() and parseDiffHeader()

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=38320

           Summary: svn-apply: Add an "isBinary" property to the hashes
                    returned by parseDiff() and parseDiffHeader()
           Product: WebKit
           Version: 528+ (Nightly build)
          Platform: All
        OS/Version: All
            Status: NEW
          Severity: Normal
          Priority: P2
         Component: Tools / Tests
        AssignedTo: webkit-unassigned at lists.webkit.org
        ReportedBy: cjerdonek at webkit.org
                CC: dbates at webkit.org
        Depends on: 38319


This will allow us to address part of this FIXME in both svn-apply and
svn-unapply:

>    # FIXME: This information should be extracted from the diff file as
>    #        part of the parsing stage, i.e. the call to parsePatch().
>    $addition = 1 if ($patch =~ /\n--- .+\(revision 0\)\r?\n/ || $patch =~ /\n@@ -0,0 .* @@/) && !exists($copiedFiles{$fullPath});
>    $deletion = 1 if $patch =~ /\n@@ .* \+0,0 @@/;
>    $isBinary = 1 if $patch =~ /\nCannot display: file marked as a binary type\./;
>    $isGitBinary = 1 if $patch =~ /\nGIT binary patch\n/;

This can be fixed by adjusting this area of VCSUtils's parseDiffHeader():

>        } elsif (s/^\+\+\+ \S+/+++ $indexPath/ ||
>                 /^Cannot display: file marked as a binary type.$/ || # SVN binary
>                 /^GIT binary patch$/) {
>            # +++
>            $foundHeaderEnding = 1;
>        }

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.