<!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>[211833] 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/211833">211833</a></dd>
<dt>Author</dt> <dd>jbedard@apple.com</dd>
<dt>Date</dt> <dd>2017-02-07 13:02:43 -0800 (Tue, 07 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>File index appended to previous file in svn-create-patch with SVN 1.9
https://bugs.webkit.org/show_bug.cgi?id=167903
<rdar://problem/30387395>
Reviewed by Daniel Bates.
* Scripts/VCSUtils.pm:
(fixSVNPatchForAdditionWithHistory): Append a trailing newline character.
* Scripts/webkitperl/VCSUtils_unittest/fixSVNPatchForAdditionWithHistory.pl: Do not remove
trailing newline character from the expected result before comparing it to the actual result.</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_unittestfixSVNPatchForAdditionWithHistorypl">trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/fixSVNPatchForAdditionWithHistory.pl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (211832 => 211833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-02-07 20:56:19 UTC (rev 211832)
+++ trunk/Tools/ChangeLog 2017-02-07 21:02:43 UTC (rev 211833)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-02-07 Jonathan Bedard <jbedard@apple.com>
+
+ File index appended to previous file in svn-create-patch with SVN 1.9
+ https://bugs.webkit.org/show_bug.cgi?id=167903
+ <rdar://problem/30387395>
+
+ Reviewed by Daniel Bates.
+
+ * Scripts/VCSUtils.pm:
+ (fixSVNPatchForAdditionWithHistory): Append a trailing newline character.
+ * Scripts/webkitperl/VCSUtils_unittest/fixSVNPatchForAdditionWithHistory.pl: Do not remove
+ trailing newline character from the expected result before comparing it to the actual result.
+
</ins><span class="cx"> 2017-02-07 Olivier Blin <olivier.blin@softathome.com>
</span><span class="cx">
</span><span class="cx"> [webkitdirs] remove unused host_processor variable in determineArchitecture()
</span></span></pre></div>
<a id="trunkToolsScriptsVCSUtilspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/VCSUtils.pm (211832 => 211833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/VCSUtils.pm 2017-02-07 20:56:19 UTC (rev 211832)
+++ trunk/Tools/Scripts/VCSUtils.pm 2017-02-07 21:02:43 UTC (rev 211833)
</span><span class="lines">@@ -1779,7 +1779,7 @@
</span><span class="cx"> return "";
</span><span class="cx"> }
</span><span class="cx"> splice(@lines, 0, 2) if $lines[2] =~ /$svnDiffStartRegEx/;
</span><del>- return join($lineEnding, @lines);
</del><ins>+ return join($lineEnding, @lines) . "\n"; # patch(1) expects an extra trailing newline.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # If possible, returns a ChangeLog patch equivalent to the given one,
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlVCSUtils_unittestfixSVNPatchForAdditionWithHistorypl"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/fixSVNPatchForAdditionWithHistory.pl (211832 => 211833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/fixSVNPatchForAdditionWithHistory.pl 2017-02-07 20:56:19 UTC (rev 211832)
+++ trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/fixSVNPatchForAdditionWithHistory.pl 2017-02-07 21:02:43 UTC (rev 211833)
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx"> my $testNameStart = "fixSVNPatchForAdditionWithHistory(): $testCase->{diffName}: comparing";
</span><span class="cx">
</span><span class="cx"> my $got = VCSUtils::fixSVNPatchForAdditionWithHistory($testCase->{inputText});
</span><del>- chomp(my $expectedReturn = $testCase->{expectedReturn});
</del><ins>+ my $expectedReturn = $testCase->{expectedReturn};
</ins><span class="cx">
</span><span class="cx"> is_deeply($got, $expectedReturn, "$testNameStart return value.");
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>