Changeset 211543 in webkit

Timestamp:

Feb 1, 2017 5:41:24 PM (7 years ago)

Author:

dbates@webkit.org

Message:

REGRESSION (r210820): svn-create-patch does not emit property change only diff
​https://bugs.webkit.org/show_bug.cgi?id=167169

Reviewed by David Kilzer.

More directly handle the SVN 1.9 or newer syntax change for a diff of a copied or moved file

• a SVN diff header and an empty body. In particular, remove a duplicate leading SVN diff

header from the output of "svn diff" on a file that was copied or moved.

Following r210820 svn-create-patch emits to standard output a diff only if it has at least one
chunk range line (e.g. @@ -0,0 +1,7 @@) as a means to workaround a syntax change in the diff
output of a copied or moved file in SVN version 1.9 or newer. In SVN 1.9 or newer "svn diff"
of a copied or moved file always emits to standard output a leading SVN diff header (an "Index:"
line followed by a separator line) with an empty body; => no chunk range lines. However a diff
of a file with only a property change also does not contain any chunk range lines. Therefore
svn-create-patch no longer emitted to standard output such a diff. Instead of indirectly detecting
a SVN diff header with an empty body by counting the number of chunk range lines in the diff
we should directly test for the presence of a leading SVN diff header with an empty body and
remove such lines from the diff.

• Scripts/VCSUtils.pm:

(fixSVNPatchForAdditionWithHistory): Added.

• Scripts/svn-create-patch:

(generateDiff): Pass the output from "svn diff" to fixSVNPatchForAdditionWithHistory() when
we have a non empty patch for an added file with history (i.e. a copied or moved file).

• Scripts/webkitperl/VCSUtils_unittest/fixSVNPatchForAdditionWithHistory.pl: Added.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/VCSUtils.pm (modified) (1 diff)
• Scripts/svn-create-patch (modified) (2 diffs)
• Scripts/webkitperl/VCSUtils_unittest/fixSVNPatchForAdditionWithHistory.pl (added)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-02-01  Daniel Bates  <dabates@apple.com>
+
+        REGRESSION (r210820): svn-create-patch does not emit property change only diff
+        https://bugs.webkit.org/show_bug.cgi?id=167169
+
+        Reviewed by David Kilzer.
+
+        More directly handle the SVN 1.9 or newer syntax change for a diff of a copied or moved file
+        - a SVN diff header and an empty body. In particular, remove a duplicate leading SVN diff
+        header from the output of "svn diff" on a file that was copied or moved.
+
+        Following r210820 svn-create-patch emits to standard output a diff only if it has at least one
+        chunk range line (e.g. @@ -0,0 +1,7 @@) as a means to workaround a syntax change in the diff
+        output of a copied or moved file in SVN version 1.9 or newer. In SVN 1.9 or newer "svn diff"
+        of a copied or moved file always emits to standard output a leading SVN diff header (an "Index:"
+        line followed by a separator line) with an empty body; => no chunk range lines. However a diff
+        of a file with only a property change also does not contain any chunk range lines. Therefore
+        svn-create-patch no longer emitted to standard output such a diff. Instead of indirectly detecting
+        a SVN diff header with an empty body by counting the number of chunk range lines in the diff
+        we should directly test for the presence of a leading SVN diff header with an empty body and
+        remove such lines from the diff.
+
+        * Scripts/VCSUtils.pm:
+        (fixSVNPatchForAdditionWithHistory): Added.
+        * Scripts/svn-create-patch:
+        (generateDiff): Pass the output from "svn diff" to fixSVNPatchForAdditionWithHistory() when
+        we have a non empty patch for an added file with history (i.e. a copied or moved file).
+        * Scripts/webkitperl/VCSUtils_unittest/fixSVNPatchForAdditionWithHistory.pl: Added.
+
 2017-02-01  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Tools/Scripts/VCSUtils.pm

@@ -1737 +1737 @@
 }
 
+# Removes a leading Subversion header without an associated diff if one exists.
+#
+# This subroutine dies if the specified patch does not begin with an "Index:" line.
+#
+# In SVN 1.9 or newer, "svn diff" of a moved/copied file without post changes always
+# emits a leading header without an associated diff:
+#     Index: B.txt
+#     ===================================================================
+# (end of file or next header)
+#
+# If the same file has a property change then the patch has the form:
+#     Index: B.txt
+#     ===================================================================
+#     Index: B.txt
+#     ===================================================================
+#     --- B.txt    (revision 1)
+#     +++ B.txt    (working copy)
+#
+#     Property change on B.txt
+#     ___________________________________________________________________
+#     Added: svn:executable
+#     ## -0,0 +1 ##
+#     +*
+#     \ No newline at end of property
+#
+# We need to apply this function to the ouput of "svn diff" for an addition with history
+# to remove a duplicate header so that svn-apply can apply the resulting patch.
+sub fixSVNPatchForAdditionWithHistory($)
+{
+    my ($patch) = @_;
+
+    $patch =~ /(\r?\n)/;
+    my $lineEnding = $1;
+    my @lines = split(/$lineEnding/, $patch);
+
+    if ($lines[0] !~ /$svnDiffStartRegEx/) {
+        die("First line of SVN diff does not begin with \"Index \": \"$lines[0]\"");
+    }
+    if (@lines <= 2) {
+        return "";
+    }
+    splice(@lines, 0, 2) if $lines[2] =~ /$svnDiffStartRegEx/;
+    return join($lineEnding, @lines);
+}
+
 # If possible, returns a ChangeLog patch equivalent to the given one,
 # but with the newest ChangeLog entry inserted at the top of the

trunk/Tools/Scripts/svn-create-patch

@@ -226 +226 @@
     
     my $patch = "";
-    if ($fileData->{modificationType} eq "additionWithHistory") {
+    my $isAdditionWithHistory = $fileData->{modificationType} eq "additionWithHistory";
+    if ($isAdditionWithHistory) {
         manufacturePatchForAdditionWithHistory($fileData);
     }
@@ -233 +234 @@
     my $escapedFile = escapeSubversionPath($file);
     open DIFF, "svn diff --diff-cmd diff -x -$diffOptions '$escapedFile' |" or die;
-    my $numTextChunks = 0;
     while (<DIFF>) {
-        $numTextChunks += 1 if parseChunkRange($_);
         $patch .= $_;
     }
     close DIFF;
-    if (!$numTextChunks) {
-        # For moved/copied files without post changes SVN 1.9 or greater emits a diff with an empty
-        # body as opposed to emitting nothing as in earlier versions of SVN. For example, move file
-        # A.txt to B.txt then the diff of B.txt in SVN 1.9 or greater is:
-        #     Index: B.txt
-        #     ===================================================================
-        # Therefore we ignore emitting such a diff.
-        $patch = "";
-    }
+    $patch = fixSVNPatchForAdditionWithHistory($patch) if $patch && $isAdditionWithHistory;
     if (basename($file) eq "ChangeLog") {
         my $changeLogHash = fixChangeLogPatch($patch);