Changeset 232228 in webkit

Timestamp:

May 27, 2018 9:50:42 AM (6 years ago)

Author:

ddkilzer@apple.com

Message:

svn-apply fails when a patch has an empty file
<​https://webkit.org/b/29684>

Reviewed by Daniel Bates.

Prior to this change, applying the following patches resulted in:

• svn: add empty file (failure)
• svn: delete empty file (failure)
• svn: rename empty file (failure)
• git: add empty file (false-positive success)
• git: delete empty file (success)
• git: rename empty file (failure)

• Scripts/VCSUtils.pm:

(parseSvnDiffHeader): Handle the case when there is no patch
following the header. If the file exists and is empty, that
means it's a deletion. If the file does not exist, that means
it's an addition. Everything else is a fatal error.

• Scripts/svn-apply:

(patch):

• Only apply a patch for deletion if it has one or more text chunks.
• Add a case to handle adding an empty file (an addition with no text chunks), and verify the file doesn't exist yet.
• Any unhandled patch is a fatal error.
• Scripts/webkitperl/VCSUtils_unittest/parseSvnDiffHeader.pl:

Add tests for adding an empty file and deleting an empty file.

• Scripts/webkitperl/VCSUtils_unittest/resources/empty.txt: Add.

Used by parseSvnDiffHeader.pl unit test for "add an empty file"
test case.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/VCSUtils.pm (modified) (3 diffs)
• Scripts/svn-apply (modified) (2 diffs)
• Scripts/webkitperl/VCSUtils_unittest/parseSvnDiffHeader.pl (modified) (1 diff)
• Scripts/webkitperl/VCSUtils_unittest/resources (added)
• Scripts/webkitperl/VCSUtils_unittest/resources/empty.txt (added)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-05-27  David Kilzer  <ddkilzer@apple.com>
+
+        svn-apply fails when a patch has an empty file
+        <https://webkit.org/b/29684>
+
+        Reviewed by Daniel Bates.
+
+        Prior to this change, applying the following patches resulted in:
+        - svn: add empty file     (failure)
+        - svn: delete empty file  (failure)
+        - svn: rename empty file  (failure)
+        - git: add empty file     (false-positive success)
+        - git: delete empty file  (success)
+        - git: rename empty file  (failure)
+
+        * Scripts/VCSUtils.pm:
+        (parseSvnDiffHeader): Handle the case when there is no patch
+        following the header.  If the file exists and is empty, that
+        means it's a deletion.  If the file does not exist, that means
+        it's an addition. Everything else is a fatal error.
+        * Scripts/svn-apply:
+        (patch):
+        - Only apply a patch for deletion if it has one or more text
+          chunks.
+        - Add a case to handle adding an empty file (an addition with no
+          text chunks), and verify the file doesn't exist yet.
+        - Any unhandled patch is a fatal error.
+        * Scripts/webkitperl/VCSUtils_unittest/parseSvnDiffHeader.pl:
+        Add tests for adding an empty file and deleting an empty file.
+        * Scripts/webkitperl/VCSUtils_unittest/resources/empty.txt: Add.
+        Used by parseSvnDiffHeader.pl unit test for "add an empty file"
+        test case.
+
 2018-05-25  Aakash Jain  <aakash_jain@apple.com>
 

trunk/Tools/Scripts/VCSUtils.pm

@@ -939 +939 @@
     my $foundHeaderEnding;
     my $isBinary;
+    my $isDeletion;
     my $isNew;
     my $sourceRevision;
@@ -993 +994 @@
 
     if (!$foundHeaderEnding) {
-        die("Did not find end of header block corresponding to index path \"$indexPath\".");
+        if (-z $indexPath) {
+            # Delete an empty file.
+            $isDeletion = 1;
+        } elsif (! -e $indexPath) {
+            # Add an empty file.
+            $isNew = 1;
+        } else {
+            die "Did not find end of header block corresponding to index path \"$indexPath\".";
+        }
     }
 
@@ -1001 +1010 @@
     $header{indexPath} = $indexPath;
     $header{isBinary} = $isBinary if $isBinary;
+    $header{isDeletion} = $isDeletion if $isDeletion;
     $header{isNew} = $isNew if $isNew;
     $header{sourceRevision} = $sourceRevision if $sourceRevision;

trunk/Tools/Scripts/svn-apply

@@ -364 +364 @@
             }
         } elsif ($deletion) {
-            applyPatch($patch, $fullPath, ["--force"]) if $patch;
+            applyPatch($patch, $fullPath, ["--force"]) if ($patch && $hasTextChunks);
             scmRemove($fullPath);
         } elsif ($addition && $hasTextChunks) {
@@ -375 +375 @@
             # What is this for?
             system("svn", "stat", "$escapedFullPath") if isSVN() && -e "$fullPath.orig";
+        } elsif ($addition && !$hasTextChunks) {
+            # Add empty file.
+            die "\"$fullPath\" already exists" if -e $fullPath;
+            open(my $FH, ">>", $fullPath) or die "Could not open \"$fullPath\" for writing: $!";
+            close($FH);
+            scmAdd($fullPath);
+        } else {
+            die "Can't handle patch for \"$fullPath\".";
         }
     }

trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/parseSvnDiffHeader.pl

@@ -267 +267 @@
     expectedNextLine => "Property changes on: test_file.swf\n",
 },
+####
+#    Empty file test cases
+##
+{
+    # New test
+    diffName => "add an empty file",
+    inputText => <<'END',
+Index: empty_file_that_should_never_exist
+===================================================================
+END
+    expectedReturn => [
+{
+    svnConvertedText => <<'END',
+Index: empty_file_that_should_never_exist
+===================================================================
+END
+    indexPath => "empty_file_that_should_never_exist",
+    isNew => 1,
+},
+undef],
+    expectedNextLine => undef,
+},
+{
+    # New test
+    diffName => "delete an empty file",
+    inputText => <<'END',
+Index: Tools/Scripts/webkitperl/VCSUtils_unittest/resources/empty.txt
+===================================================================
+END
+    expectedReturn => [
+{
+    svnConvertedText => <<'END',
+Index: Tools/Scripts/webkitperl/VCSUtils_unittest/resources/empty.txt
+===================================================================
+END
+    indexPath => "Tools/Scripts/webkitperl/VCSUtils_unittest/resources/empty.txt",
+    isDeletion => 1,
+},
+undef],
+    expectedNextLine => undef,
+},
 );