[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit cb8ee029f50fc9d5c2cf46e1ef44e36ea91c7cbc
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 20 14:45:03 2010 +0000

    2010-08-20  Daniel Bates  <dbates at rim.com>
    
            Reviewed by Eric Seidel.
    
            svn-apply doesn't detect empty line with Windows line endings
            after property value
            https://bugs.webkit.org/show_bug.cgi?id=43981
    
            Fixes an issue where an empty line following the property value
            in an SVN property change diff would not be detected if it had
            Windows line endings (i.e. ended in CRLF). Hence it was consumed
            as if it was part of a multi-line property value.
    
            * Scripts/VCSUtils.pm:
              - Modified parseSvnPropertyValue() to detect empty line
                with Windows line endings.
              - Added toWindowsLineEndings().
            * Scripts/webkitperl/VCSUtils_unittest/parseDiff.pl:
              - Added the following test cases:
                "SVN: binary file (isBinary true) using Windows line endings"
                "SVN: property diff, followed by file change diff using Windows line endings"
                "SVN: two consecutive property diffs using Windows line endings"
                "SVN: binary file with executable bit change usng Windows line endings"
                "SVN: binary file followed by property change on different file using Windows line endings"
                "SVN: binary file followed by file change on different file using Windows line endings"
                "SVN: file change diff with property change, followed by property change diff using Windows line endings"
                "SVN: file change diff with property change, followed by file change diff using Windows line endings"
            * Scripts/webkitperl/VCSUtils_unittest/parseSvnProperty.pl:
              - Added the following test cases:
                "add svn:executable, followed by empty line and start of next diff using Windows line endings"
                "add svn:executable, followed by empty line and start of next property diff using Windows line endings"
                "multi-line '+' change, followed by empty line and start of next diff using Windows line endings"
                "multi-line '+' change, followed by empty line and start of next property diff using Windows line endings"
                "add svn:executable, followed by empty line and start of binary patch using Windows line endings"
                "multi-line '+' change, followed by empty line and start of binary patch using Windows line endings"
                "multi-line '-' change, followed by multi-line '+' change, empty line, and start of binary patch using Windows line endings"
                "single-line '+' with trailing new line using Windows line endings"
                "single-line '+' with trailing new line, followed by empty line and start of binary patch using Windows line endings"
                "single-line '-' change with trailing new line, and single-line '+' change using Windows line endings"
                "multi-line '-' change with trailing new line, and multi-line '+' change using Windows line endings"
            * Scripts/webkitperl/VCSUtils_unittest/parseSvnPropertyValue.pl:
              - Added the following test cases:
                "single-line '-' change followed by empty line with Windows line endings"
                "multi-line '+' change and start of binary patch with Windows line endings"
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65732 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index cf983de..92b6256 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,48 @@
+2010-08-20  Daniel Bates  <dbates at rim.com>
+
+        Reviewed by Eric Seidel.
+
+        svn-apply doesn't detect empty line with Windows line endings
+        after property value
+        https://bugs.webkit.org/show_bug.cgi?id=43981
+
+        Fixes an issue where an empty line following the property value
+        in an SVN property change diff would not be detected if it had
+        Windows line endings (i.e. ended in CRLF). Hence it was consumed
+        as if it was part of a multi-line property value. 
+
+        * Scripts/VCSUtils.pm:
+          - Modified parseSvnPropertyValue() to detect empty line
+            with Windows line endings.
+          - Added toWindowsLineEndings().
+        * Scripts/webkitperl/VCSUtils_unittest/parseDiff.pl:
+          - Added the following test cases:
+            "SVN: binary file (isBinary true) using Windows line endings"
+            "SVN: property diff, followed by file change diff using Windows line endings"
+            "SVN: two consecutive property diffs using Windows line endings"
+            "SVN: binary file with executable bit change usng Windows line endings"
+            "SVN: binary file followed by property change on different file using Windows line endings"
+            "SVN: binary file followed by file change on different file using Windows line endings"
+            "SVN: file change diff with property change, followed by property change diff using Windows line endings"
+            "SVN: file change diff with property change, followed by file change diff using Windows line endings"
+        * Scripts/webkitperl/VCSUtils_unittest/parseSvnProperty.pl:
+          - Added the following test cases:
+            "add svn:executable, followed by empty line and start of next diff using Windows line endings"
+            "add svn:executable, followed by empty line and start of next property diff using Windows line endings"
+            "multi-line '+' change, followed by empty line and start of next diff using Windows line endings"
+            "multi-line '+' change, followed by empty line and start of next property diff using Windows line endings"
+            "add svn:executable, followed by empty line and start of binary patch using Windows line endings"
+            "multi-line '+' change, followed by empty line and start of binary patch using Windows line endings"
+            "multi-line '-' change, followed by multi-line '+' change, empty line, and start of binary patch using Windows line endings"
+            "single-line '+' with trailing new line using Windows line endings"
+            "single-line '+' with trailing new line, followed by empty line and start of binary patch using Windows line endings"
+            "single-line '-' change with trailing new line, and single-line '+' change using Windows line endings"
+            "multi-line '-' change with trailing new line, and multi-line '+' change using Windows line endings"
+        * Scripts/webkitperl/VCSUtils_unittest/parseSvnPropertyValue.pl:
+          - Added the following test cases:
+            "single-line '-' change followed by empty line with Windows line endings"
+            "multi-line '+' change and start of binary patch with Windows line endings"
+
 2010-08-19  David Kilzer  <ddkilzer at apple.com>
 
         BUILD FIX: Fix Mac build after Windows WebKit2 changes for Netscape Plug-ins
diff --git a/WebKitTools/Scripts/VCSUtils.pm b/WebKitTools/Scripts/VCSUtils.pm
index 4516984..05d7bd8 100644
--- a/WebKitTools/Scripts/VCSUtils.pm
+++ b/WebKitTools/Scripts/VCSUtils.pm
@@ -72,6 +72,7 @@ BEGIN {
         &setChangeLogDateAndReviewer
         &svnRevisionForDirectory
         &svnStatus
+        &toWindowsLineEndings
     );
     %EXPORT_TAGS = ( );
     @EXPORT_OK   = ();
@@ -128,6 +129,13 @@ sub callSilently($@) {
     return @returnValue;
 }
 
+sub toWindowsLineEndings
+{
+    my ($text) = @_;
+    $text =~ s/\n/\r\n/g;
+    return $text;
+}
+
 # Note, this method will not error if the file corresponding to the path does not exist.
 sub scmToggleExecutableBit
 {
@@ -1089,7 +1097,7 @@ sub parseSvnPropertyValue($$)
     }
 
     while (<$fileHandle>) {
-        if (/^$/ || /$svnPropertyValueStartRegEx/ || /$svnPropertyStartRegEx/) {
+        if (/^[\r\n]+$/ || /$svnPropertyValueStartRegEx/ || /$svnPropertyStartRegEx/) {
             # 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.

-- 
WebKit Debian packaging