Attachment 348782 Details for Bug 14590 – Patch v2

[patch] Patch v2

bug-14590-20180903112421.patch (text/plain), 5.18 KB, created by David Kilzer (:ddkilzer) on 2018-09-03 11:24:22 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: David Kilzer (:ddkilzer)

Created: 2018-09-03 11:24:22 PDT

Size: 5.18 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 235600)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,23 @@
>+2018-09-03  David Kilzer  <ddkilzer@apple.com>
>+
>+        svn-create-patch fails when svn mv is used on directory trees
>+        <https://webkit.org/b/14590>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/svn-create-patch:
>+        (generateDiff): Return early for moved directories since
>+        individual files within the directory are handled separately.
>+        (generateFileList): Keep track of moved directories in the
>+        @additionWithHistoryDirectories array, then process this array
>+        in reverse order to create delete/add patches for each file in
>+        a moved directory.
>+        (manufacturePatchForAdditionWithHistory): Fix a long-standing
>+        bug where the path used to describe property changes contained
>+        the original (moved-from) path instead of the new (moved-to)
>+        path. This could cause svn-apply to fail mysteriously when
>+        trying to apply an empty patch.
>+
> 2018-09-01  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         [WPE] 2.21.91 fails to build with ENABLE_MINIBROWSER
>Index: Tools/Scripts/svn-create-patch
>===================================================================
>--- Tools/Scripts/svn-create-patch	(revision 235584)
>+++ Tools/Scripts/svn-create-patch	(working copy)
>@@ -35,10 +35,7 @@
> #   Handles binary files (encoded as a base64 chunk of text).
> #   Sorts the diffs alphabetically by text files, then binary files.
> #   Handles copied and moved files.
>-#
>-# Missing features:
>-#
>-#   Handle copied and moved directories.
>+#   Handles copied and moved directories.
> 
> use strict;
> use warnings;
>@@ -252,6 +249,8 @@ sub generateDiff($$)
>     my $patch = "";
>     my $isAdditionWithHistory = $fileData->{modificationType} eq "additionWithHistory";
>     if ($isAdditionWithHistory) {
>+        # Nothing to do for a moved directory since each moved file is handled individually.
>+        return if -d $fileData->{path};
>         manufacturePatchForAdditionWithHistory($fileData, $prefix);
>     }
> 
>@@ -283,6 +282,7 @@ sub generateFileList($\%)
>     my %testDirectories = map { $_ => 1 } qw(LayoutTests);
>     my $escapedStatPath = escapeSubversionPath($statPath);
>     my @deletedFiles;
>+    my @additionWithHistoryDirectories;
> 
>     print STDERR "Performing \"svn stat '$escapedStatPath'\"\n" if $verbose;
> 
>@@ -305,8 +305,6 @@ sub generateFileList($\%)
>             $path = substr($line, 7);
>         }
> 
>-        next if -d $path;
>-
>         my $modificationType = findModificationType($stat);
> 
>         if ($modificationType eq "missing") {
>@@ -343,10 +341,38 @@ sub generateFileList($\%)
>             my ($sourceFile, $sourceRevision) = findSourceFileAndRevision($path);
>             $diffFiles->{$path}->{sourceFile} = $sourceFile;
>             $diffFiles->{$path}->{sourceRevision} = $sourceRevision;
>+            push(@additionWithHistoryDirectories, $path) if -d $path;
>         }
>     }
>     close STAT;
> 
>+    # Handle these in reverse order so that the deepest directory moves are processed first.
>+    # Shallow directory moves include changes for deeper directories, which causes double
>+    # processing and causes the wrong original path to be used.
>+    foreach my $directory (reverse @additionWithHistoryDirectories) {
>+        my ($sourceDirectory, $sourceRevision) = findSourceFileAndRevision($directory);
>+        # Gather a hierarchical list of files inside the moved directory.
>+        my $diffOptions = diffOptionsForFile($sourceDirectory);
>+        my $escapedDirectory = escapeSubversionPath($directory);
>+        print STDERR "Performing \"svn diff --diff-cmd diff -x -$diffOptions '$escapedDirectory'\"\n" if $verbose;
>+        open DIFF, "svn diff --diff-cmd diff -x -$diffOptions '$escapedDirectory' |" or die;
>+        while (<DIFF>) {
>+            if (m/^Index: (.*)$/) {
>+                my $movedFile = $1;
>+                # Ignore other files added/moved into the moved directory.
>+                next if exists $diffFiles->{$movedFile};
>+                $diffFiles->{$movedFile}->{path} = $movedFile;
>+                $diffFiles->{$movedFile}->{modificationType} = "additionWithHistory";
>+                $diffFiles->{$movedFile}->{isBinary} = isBinaryMimeType($movedFile);
>+                $diffFiles->{$movedFile}->{isTestFile} = exists $testDirectories{(File::Spec->splitdir($movedFile))[0]} ? 1 : 0;
>+                my $relativePath = File::Spec->abs2rel("/" . $movedFile, "/" . $directory);
>+                $diffFiles->{$movedFile}->{sourceFile} = File::Spec->catfile($sourceDirectory, $relativePath);
>+                $diffFiles->{$movedFile}->{sourceRevision} = $sourceRevision;
>+            }
>+        }
>+        close DIFF;
>+    }
>+
>     foreach my $path (@deletedFiles) {
>         my $isInsideDeletedDirectory = 0;
>         foreach my $compare (@deletedFiles) {
>@@ -408,6 +434,7 @@ sub manufacturePatchForAdditionWithHisto
>         while (<DIFF>) {
>             # Skip the diff header, since it was manufactured aboved.
>             next if ++$count < 5;
>+            s/^(Property changes on:\s+)$sourceFile$/$1$file/;
>             print $_;
>         }
>         close DIFF;

Actions: View | Formatted Diff | Diff

Attachments on bug 14590: 348766 | 348782 | 348784 | 348853 | 348862 | 348961