<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[191900] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/191900">191900</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2015-11-02 10:46:58 -0800 (Mon, 02 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>svn-apply should handle unified diffs
https://bugs.webkit.org/show_bug.cgi?id=150650
Reviewed by Darin Adler.
* Scripts/VCSUtils.pm:
(parseUnifiedDiffHeader):
This method parses a unified diff header, and returns a information in the
style of parseGitDiffHeader and parseSvnDiffHeader.
(parseDiffHeader):
Teach parseDiffHeader to recognize unified diff headers.
(parseDiff):
Teach parseDiff to recognize unified diffs.
* Scripts/webkitperl/VCSUtils_unittest/parseDiffHeader.pl:
* Scripts/webkitperl/VCSUtils_unittest/parseUnifiedDiffHeader.pl: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsVCSUtilspm">trunk/Tools/Scripts/VCSUtils.pm</a></li>
<li><a href="#trunkToolsScriptswebkitperlVCSUtils_unittestparseDiffHeaderpl">trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffHeader.pl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsScriptswebkitperlVCSUtils_unittestparseUnifiedDiffHeaderpl">trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/parseUnifiedDiffHeader.pl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (191899 => 191900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-11-02 18:42:37 UTC (rev 191899)
+++ trunk/Tools/ChangeLog 2015-11-02 18:46:58 UTC (rev 191900)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-10-30 Dana Burkart <dburkart@apple.com>
+
+ svn-apply should handle unified diffs
+ https://bugs.webkit.org/show_bug.cgi?id=150650
+
+ Reviewed by Darin Adler.
+
+ * Scripts/VCSUtils.pm:
+ (parseUnifiedDiffHeader):
+ This method parses a unified diff header, and returns a information in the
+ style of parseGitDiffHeader and parseSvnDiffHeader.
+
+ (parseDiffHeader):
+ Teach parseDiffHeader to recognize unified diff headers.
+
+ (parseDiff):
+ Teach parseDiff to recognize unified diffs.
+
+ * Scripts/webkitperl/VCSUtils_unittest/parseDiffHeader.pl:
+ * Scripts/webkitperl/VCSUtils_unittest/parseUnifiedDiffHeader.pl: Added.
+
</ins><span class="cx"> 2015-11-02 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix the FTL JIT build with system LLVM on Linux
</span></span></pre></div>
<a id="trunkToolsScriptsVCSUtilspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/VCSUtils.pm (191899 => 191900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/VCSUtils.pm 2015-11-02 18:42:37 UTC (rev 191899)
+++ trunk/Tools/Scripts/VCSUtils.pm 2015-11-02 18:46:58 UTC (rev 191900)
</span><span class="lines">@@ -109,6 +109,7 @@
</span><span class="cx"> # Project time zone for Cupertino, CA, US
</span><span class="cx"> my $changeLogTimeZone = "PST8PDT";
</span><span class="cx">
</span><ins>+my $unifiedDiffStartRegEx = qr#^--- ([abc]\/)?([^\r\n]+)#;
</ins><span class="cx"> my $gitDiffStartRegEx = qr#^diff --git [^\r\n]+#;
</span><span class="cx"> my $gitDiffStartWithPrefixRegEx = qr#^diff --git \w/(.+) \w/([^\r\n]+)#; # We suppose that --src-prefix and --dst-prefix don't contain a non-word character (\W) and end with '/'.
</span><span class="cx"> my $gitDiffStartWithoutPrefixNoSpaceRegEx = qr#^diff --git (\S+) (\S+)$#;
</span><span class="lines">@@ -941,6 +942,103 @@
</span><span class="cx"> return (\%header, $_);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+# Parse the next Unified diff header from the given file handle, and advance
+# the handle so the last line read is the first line after the header.
+#
+# This subroutine dies if given leading junk.
+#
+# Args:
+# $fileHandle: advanced so the last line read from the handle is the first
+# line of the header to parse. This should be a line
+# beginning with "Index:".
+# $line: the line last read from $fileHandle
+#
+# Returns ($headerHashRef, $lastReadLine):
+# $headerHashRef: a hash reference representing a diff header, as follows--
+# indexPath: the path of the target file, which is the path found in
+# the "Index:" line.
+# isNew: the value 1 if the diff is for a new file.
+# isDeletion: the value 1 if the diff is a file deletion.
+# svnConvertedText: the header text converted to a header with the paths
+# in some lines corrected.
+# $lastReadLine: the line last read from $fileHandle.
+sub parseUnifiedDiffHeader($$)
+{
+ my ($fileHandle, $line) = @_;
+
+ $_ = $line;
+
+ my $currentPosition = tell($fileHandle);
+ my $indexLine;
+ my $indexPath;
+ if (/$unifiedDiffStartRegEx/) {
+ # Use $POSTMATCH to preserve the end-of-line character.
+ my $eol = $POSTMATCH;
+
+ $indexPath = $2;
+
+ # In the case of an addition, we look at the next line for the index path
+ if ($indexPath eq "/dev/null") {
+ $_ = <$fileHandle>;
+ if (/^\+\+\+ ([abc]\/)?([^\t\n\r]+)/) {
+ $indexPath = $2;
+ } else {
+ die "Unrecognized unified diff format.";
+ }
+ $_ = $line;
+ }
+
+ $indexLine = "Index: $indexPath$eol"; # Convert to SVN format.
+ } else {
+ die("Could not parse leading \"---\" line: \"$line\".");
+ }
+
+ seek($fileHandle, $currentPosition, 0);
+
+ my $isDeletion;
+ my $isHeaderEnding;
+ my $isNew;
+ my $svnConvertedText = $indexLine;
+ while (1) {
+ # Temporarily strip off any end-of-line characters to simplify
+ # regex matching below.
+ s/([\n\r]+)$//;
+ my $eol = $1;
+
+ if (/^--- \/dev\/null/) {
+ $isNew = 1;
+ } elsif (/^\+\+\+ \/dev\/null/) {
+ $isDeletion = 1;
+ }
+
+ if (/^(---|\+\+\+) ([abc]\/)?([^\t\n\r]+)/) {
+ if ($1 eq "---") {
+ my $prependText = "";
+ $prependText = "new file mode 100644\n" if $isNew;
+ $_ = "${prependText}index 0000000..0000000\n$1 $3";
+ } else {
+ $_ = "$1 $3";
+ $isHeaderEnding = 1;
+ }
+ }
+
+ $svnConvertedText .= "$_$eol"; # Also restore end-of-line characters.
+
+ $currentPosition = tell($fileHandle);
+ $_ = <$fileHandle>; # Not defined if end-of-file reached.
+ last if (!defined($_) || /$unifiedDiffStartRegEx/ || $isHeaderEnding);
+ }
+
+ my %header;
+
+ $header{indexPath} = $indexPath;
+ $header{isDeletion} = $isDeletion if $isDeletion;
+ $header{isNew} = $isNew if $isNew;
+ $header{svnConvertedText} = $svnConvertedText;
+
+ return (\%header, $_);
+}
+
</ins><span class="cx"> # Parse the next diff header from the given file handle, and advance
</span><span class="cx"> # the handle so the last line read is the first line after the header.
</span><span class="cx"> #
</span><span class="lines">@@ -979,6 +1077,7 @@
</span><span class="cx"> my $header; # This is a hash ref.
</span><span class="cx"> my $isGit;
</span><span class="cx"> my $isSvn;
</span><ins>+ my $isUnified;
</ins><span class="cx"> my $lastReadLine;
</span><span class="cx">
</span><span class="cx"> if ($line =~ $svnDiffStartRegEx) {
</span><span class="lines">@@ -987,12 +1086,16 @@
</span><span class="cx"> } elsif ($line =~ $gitDiffStartRegEx) {
</span><span class="cx"> $isGit = 1;
</span><span class="cx"> ($header, $lastReadLine) = parseGitDiffHeader($fileHandle, $line);
</span><ins>+ } elsif ($line =~ $unifiedDiffStartRegEx) {
+ $isUnified = 1;
+ ($header, $lastReadLine) = parseUnifiedDiffHeader($fileHandle, $line);
</ins><span class="cx"> } else {
</span><span class="cx"> die("First line of diff does not begin with \"Index:\" or \"diff --git\": \"$line\"");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $header->{isGit} = $isGit if $isGit;
</span><span class="cx"> $header->{isSvn} = $isSvn if $isSvn;
</span><ins>+ $header->{isUnified} = $isUnified if $isUnified;
</ins><span class="cx">
</span><span class="cx"> return ($header, $lastReadLine);
</span><span class="cx"> }
</span><span class="lines">@@ -1077,6 +1180,10 @@
</span><span class="cx"> # all diffs in the patch are formatted the same (SVN or Git).
</span><span class="cx"> $headerStartRegEx = $gitDiffStartRegEx;
</span><span class="cx"> }
</span><ins>+
+ if (!$headerHashRef && ($line =~ $unifiedDiffStartRegEx)) {
+ $headerStartRegEx = $unifiedDiffStartRegEx;
+ }
</ins><span class="cx">
</span><span class="cx"> if ($line =~ $svnPropertiesStartRegEx) {
</span><span class="cx"> my $propertyPath = $1;
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlVCSUtils_unittestparseDiffHeaderpl"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffHeader.pl (191899 => 191900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffHeader.pl 2015-11-02 18:42:37 UTC (rev 191899)
+++ trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffHeader.pl 2015-11-02 18:46:58 UTC (rev 191900)
</span><span class="lines">@@ -99,6 +99,29 @@
</span><span class="cx"> undef],
</span><span class="cx"> expectedNextLine => undef,
</span><span class="cx"> },
</span><ins>+####
+# Unified patch cases
+##
+{
+ diffName => "Unified: Modified file",
+ inputText => <<'END',
+--- Foo/bar.h
++++ Foo/bar.h
+END
+ expectedReturn => [
+{
+ svnConvertedText => <<'END',
+Index: Foo/bar.h
+index 0000000..0000000
+--- Foo/bar.h
++++ Foo/bar.h
+END
+ indexPath => 'Foo/bar.h',
+ isUnified => 1,
+},
+undef],
+ expectedNextLine => undef,
+}
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> my $testCasesCount = @testCaseHashRefs;
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlVCSUtils_unittestparseUnifiedDiffHeaderpl"></a>
<div class="addfile"><h4>Added: trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/parseUnifiedDiffHeader.pl (0 => 191900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/parseUnifiedDiffHeader.pl (rev 0)
+++ trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/parseUnifiedDiffHeader.pl 2015-11-02 18:46:58 UTC (rev 191900)
</span><span class="lines">@@ -0,0 +1,190 @@
</span><ins>+#!/usr/bin/perl -w
+#
+# Copyright (C) 2015 Apple Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Unit tests for parseUnifiedDiffHeader()
+
+use strict;
+use warnings;
+
+use Test::More;
+use VCSUtils;
+
+my @testCaseHashRefs = (
+{
+ diffName => "Modified file",
+ inputText => <<'END',
+--- Foo/bar.h
++++ Foo/bar.h
+@@ -304,6 +304,6 @@ void someKindOfFunction()
+leading
+text
+context
+-file contents
++new file contents
+trailing
+textcontext
+END
+ expectedReturn => [
+ {
+ svnConvertedText => <<'END',
+Index: Foo/bar.h
+index 0000000..0000000
+--- Foo/bar.h
++++ Foo/bar.h
+END
+ indexPath => 'Foo/bar.h',
+ },
+ "@@ -304,6 +304,6 @@ void someKindOfFunction()\n"],
+ expectedNextLine => "leading\n",
+},
+{
+ diffName => "Modified file with spaces in name",
+ inputText => <<'END',
+--- Foo/bar baz.h
++++ Foo/bar baz.h
+@@ -304,6 +304,6 @@ void someKindOfFunction()
+leading
+text
+context
+-file contents
++new file contents
+trailing
+textcontext
+END
+ expectedReturn => [
+ {
+ svnConvertedText => <<'END',
+Index: Foo/bar baz.h
+index 0000000..0000000
+--- Foo/bar baz.h
++++ Foo/bar baz.h
+END
+ indexPath => 'Foo/bar baz.h',
+ },
+ "@@ -304,6 +304,6 @@ void someKindOfFunction()\n"],
+ expectedNextLine => "leading\n",
+},
+{
+ diffName => "Modified file with git-style indices",
+ inputText => <<'END',
+--- a/Foo/bar.h
++++ b/Foo/bar.h
+@@ -304,6 +304,6 @@ void someKindOfFunction()
+leading
+text
+context
+-file contents
++new file contents
+trailing
+textcontext
+END
+ expectedReturn => [
+ {
+ svnConvertedText => <<'END',
+Index: Foo/bar.h
+index 0000000..0000000
+--- Foo/bar.h
++++ Foo/bar.h
+END
+ indexPath => 'Foo/bar.h',
+ },
+ "@@ -304,6 +304,6 @@ void someKindOfFunction()\n"],
+ expectedNextLine => "leading\n",
+},
+{
+ diffName => "Added file",
+ inputText => <<'END',
+--- /dev/null
++++ Foo/bar.h
+@@ -0,0 +1,6 @@
++leading
++text
++context
++new file contents
++trailing
++textcontext
+END
+ expectedReturn => [
+ {
+ svnConvertedText => <<'END',
+Index: Foo/bar.h
+new file mode 100644
+index 0000000..0000000
+--- /dev/null
++++ Foo/bar.h
+END
+ indexPath => 'Foo/bar.h',
+ isNew => 1,
+ },
+ "@@ -0,0 +1,6 @@\n"],
+ expectedNextLine => "+leading\n",
+},
+{
+ diffName => "Removed file",
+ inputText => <<'END',
+--- Foo/bar.h
++++ /dev/null
+@@ -0,0 +1,6 @@
+-leading
+-text
+-context
+-new file contents
+-trailing
+-textcontext
+END
+ expectedReturn => [
+ {
+ svnConvertedText => <<'END',
+Index: Foo/bar.h
+index 0000000..0000000
+--- Foo/bar.h
++++ /dev/null
+END
+ indexPath => 'Foo/bar.h',
+ isDeletion => 1,
+ },
+ "@@ -0,0 +1,6 @@\n"],
+ expectedNextLine => "-leading\n",
+},
+);
+
+
+my $testCasesCount = @testCaseHashRefs;
+plan(tests => 2 * $testCasesCount); # Total number of assertions.
+
+foreach my $testCase (@testCaseHashRefs) {
+ my $testNameStart = "parseUnifiedDiffHeader(): $testCase->{diffName}: comparing";
+
+ my $fileHandle;
+ open($fileHandle, "<", \$testCase->{inputText});
+ my $line = <$fileHandle>;
+
+ my @got = VCSUtils::parseUnifiedDiffHeader($fileHandle, $line);
+ my $expectedReturn = $testCase->{expectedReturn};
+
+ is_deeply(\@got, $expectedReturn, "$testNameStart return value.");
+
+ my $gotNextLine = <$fileHandle>;
+ is($gotNextLine, $testCase->{expectedNextLine}, "$testNameStart next read line.");
+}
</ins></span></pre>
</div>
</div>
</body>
</html>