Title: [211833] trunk/Tools
- Revision
- 211833
- Author
- jbed...@apple.com
- Date
- 2017-02-07 13:02:43 -0800 (Tue, 07 Feb 2017)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (211832 => 211833)
--- trunk/Tools/ChangeLog 2017-02-07 20:56:19 UTC (rev 211832)
+++ trunk/Tools/ChangeLog 2017-02-07 21:02:43 UTC (rev 211833)
@@ -1,3 +1,16 @@
+2017-02-07 Jonathan Bedard <jbed...@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.
+
2017-02-07 Olivier Blin <olivier.b...@softathome.com>
[webkitdirs] remove unused host_processor variable in determineArchitecture()
Modified: trunk/Tools/Scripts/VCSUtils.pm (211832 => 211833)
--- 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)
@@ -1779,7 +1779,7 @@
return "";
}
splice(@lines, 0, 2) if $lines[2] =~ /$svnDiffStartRegEx/;
- return join($lineEnding, @lines);
+ return join($lineEnding, @lines) . "\n"; # patch(1) expects an extra trailing newline.
}
# If possible, returns a ChangeLog patch equivalent to the given one,
Modified: trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/fixSVNPatchForAdditionWithHistory.pl (211832 => 211833)
--- 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)
@@ -282,7 +282,7 @@
my $testNameStart = "fixSVNPatchForAdditionWithHistory(): $testCase->{diffName}: comparing";
my $got = VCSUtils::fixSVNPatchForAdditionWithHistory($testCase->{inputText});
- chomp(my $expectedReturn = $testCase->{expectedReturn});
+ my $expectedReturn = $testCase->{expectedReturn};
is_deeply($got, $expectedReturn, "$testNameStart return value.");
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
