Modified: trunk/Tools/ChangeLog (210550 => 210551)
--- trunk/Tools/ChangeLog 2017-01-10 17:54:06 UTC (rev 210550)
+++ trunk/Tools/ChangeLog 2017-01-10 18:05:07 UTC (rev 210551)
@@ -1,3 +1,14 @@
+2017-01-10 Jonathan Bedard <[email protected]>
+
+ svn-apply failed to apply a patch (deleting file with svn property)
+ https://bugs.webkit.org/show_bug.cgi?id=165953
+
+ Reviewed by Daniel Bates.
+
+ * Scripts/VCSUtils.pm:
+ (parseSvnPropertyValue): The beginning of a diff will cause an early exit in the case of no empty newlines.
+ * Scripts/webkitperl/VCSUtils_unittest/parseSvnProperty.pl: Add tests without break between diffs for properties.
+
2017-01-10 Ryan Haddad <[email protected]>
Update flakiness dashboard configuration.
Modified: trunk/Tools/Scripts/VCSUtils.pm (210550 => 210551)
--- trunk/Tools/Scripts/VCSUtils.pm 2017-01-10 17:54:06 UTC (rev 210550)
+++ trunk/Tools/Scripts/VCSUtils.pm 2017-01-10 18:05:07 UTC (rev 210551)
@@ -1565,7 +1565,7 @@
}
while (<$fileHandle>) {
- if (/^[\r\n]+$/ || /$svnPropertyValueStartRegEx/ || /$svnPropertyStartRegEx/ || /$svnPropertyValueNoNewlineRegEx/) {
+ if (/^[\r\n]+$/ || /$svnPropertyValueStartRegEx/ || /$svnPropertyStartRegEx/ || /$svnPropertyValueNoNewlineRegEx/ || /$svnDiffStartRegEx/) {
# Note, we may encounter an empty line before the contents of a binary patch.
# Also, we check for $svnPropertyValueStartRegEx because a '-' property may be
# followed by a '+' property in the case of a "Modified" or "Name" property.
Modified: trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/parseSvnProperty.pl (210550 => 210551)
--- trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/parseSvnProperty.pl 2017-01-10 17:54:06 UTC (rev 210550)
+++ trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/parseSvnProperty.pl 2017-01-10 18:05:07 UTC (rev 210551)
@@ -236,6 +236,45 @@
"Added: svn:executable\n"],
expectedNextLine => "## -0,0 +1 ##\n",
},
+###
+# Property value using SVN 1.7 syntax followed by start of next diff
+##
+{
+ # New test
+ diffName => "add svn:ignore using SVN 1.7 syntax, followed by start of next diff",
+ inputText => <<'END',
+Added: svn:ignore
+## -0,0 +1 ##
++*
+Index: Makefile.shared
+END
+ expectedReturn => [
+{
+ name => "svn:ignore",
+ propertyChangeDelta => 1,
+ value => "*",
+},
+"Index: Makefile.shared\n"],
+ expectedNextLine => undef,
+},
+{
+ # New test
+ diffName => "remove svn:ignore using SVN 1.7 syntax, followed by start of next diff",
+ inputText => <<'END',
+Deleted: svn:ignore
+## -1 +0,0 ##
+-*
+Index: Makefile.shared
+END
+ expectedReturn => [
+{
+ name => "svn:ignore",
+ propertyChangeDelta => -1,
+ value => "*",
+},
+"Index: Makefile.shared\n"],
+ expectedNextLine => undef,
+},
####
# Property value followed by empty line and start of next diff
##
