Changeset 46156 in webkit

Timestamp:

Jul 20, 2009 11:41:30 PM (15 years ago)

Author:

mrowe@apple.com

Message:

Fix <​https://bugs.webkit.org/show_bug.cgi?id=27482>.
Bug 27482: svn-apply cannot apply patch generated by Windows SVN

Reviewed by David D. Kilzer.

A regexp in svn-apply was treating everything prior to a \n as part of the
file name. The native Windows SVN client uses \r\n for line endings which
meant that the \r was being included in the file name. This defeated the
special-case logic for ChangeLogs to apply them with an increased fuzz factor,
meaning that the ChangeLog portions of such patches would fail to apply.

Also updated two other regexps that look like they would hit similar problems
with line-endings so that they will correctly handle patches from Windows SVN.

• Scripts/svn-apply:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/svn-apply (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-07-20  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by David D. Kilzer.
+
+        Fix <https://bugs.webkit.org/show_bug.cgi?id=27482>.
+        Bug 27482: svn-apply cannot apply patch generated by Windows SVN
+
+        A regexp in svn-apply was treating everything prior to a \n as part of the
+        file name.  The native Windows SVN client uses \r\n for line endings which
+        meant that the \r was being included in the file name.  This defeated the
+        special-case logic for ChangeLogs to apply them with an increased fuzz factor,
+        meaning that the ChangeLog portions of such patches would fail to apply.
+
+        Also updated two other regexps that look like they would hit similar problems
+        with line-endings so that they will correctly handle patches from Windows SVN.
+
+        * Scripts/svn-apply:
+
 2009-07-20  Peter Kasting  <pkasting@google.com>
 

trunk/WebKitTools/Scripts/svn-apply

@@ -255 +255 @@
     my $contextLineCount = 3;
 
-    return $patch if $patch !~ /\n@@ -1,(\d+) \+1,(\d+) @@\n( .*\n)+(\+.*\n)+( .*\n){$contextLineCount}$/m;
+    return $patch if $patch !~ /\n@@ -1,(\d+) \+1,(\d+) @@\r?\n( .*\r?\n)+(\+.*\r?\n)+( .*\r?\n){$contextLineCount}$/m;
     my ($oldLineCount, $newLineCount) = ($1, $2);
     return $patch if $oldLineCount <= $contextLineCount;
@@ -359 +359 @@
     return if !$patch;
 
-    unless ($patch =~ m|^Index: ([^\n]+)|) {
+    unless ($patch =~ m|^Index: ([^\r\n]+)|) {
         my $separator = '-' x 67;
         warn "Failed to find 'Index:' in:\n$separator\n$patch\n$separator\n";
@@ -370 +370 @@
     my $isBinary = 0;
 
-    $addition = 1 if ($patch =~ /\n--- .+\(revision 0\)\n/ || $patch =~ /\n@@ -0,0 .* @@/);
+    $addition = 1 if ($patch =~ /\n--- .+\(revision 0\)\r?\n/ || $patch =~ /\n@@ -0,0 .* @@/);
     $deletion = 1 if $patch =~ /\n@@ .* \+0,0 @@/;
     $isBinary = 1 if $patch =~ /\nCannot display: file marked as a binary type\./;