Changeset 18513 in webkit

Timestamp:

Jan 1, 2007 8:13:43 PM (17 years ago)

Author:

ddkilzer

Message:

WebKitTools:

Reviewed by Darin.

​http://bugs.webkit.org/show_bug.cgi?id=12023
svn-create-patch and friends should handle moved/copied files

• Scripts/svn-apply: Identify copied files and handle those before all other patches.
• Scripts/svn-create-patch: Generate patches with subtle changes for copied files. (findMimeType($)): Added. (findModificationTime($)): Added. (findSourceFileAndRevision($)): Added. (generateDiff($$$)): Changed to use svn stat instead of svn diff. (isBinaryMimeType($)): Added. (manufacturePatchForAdditionWithHistory($$)): Added.
• Scripts/svn-unapply: Identify copied files and handle those after unapplying all other patches.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/svn-apply (modified) (5 diffs)
• Scripts/svn-create-patch (modified) (5 diffs)
• Scripts/svn-unapply (modified) (6 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2007-01-01  David Kilzer  <ddkilzer@webkit.org>
+
+        Reviewed by Darin.
+
+        http://bugs.webkit.org/show_bug.cgi?id=12023
+        svn-create-patch and friends should handle moved/copied files
+
+        * Scripts/svn-apply: Identify copied files and handle those before all other patches.
+        * Scripts/svn-create-patch: Generate patches with subtle changes for copied files.
+        (findMimeType($)): Added.
+        (findModificationTime($)): Added.
+        (findSourceFileAndRevision($)): Added.
+        (generateDiff($$$)): Changed to use svn stat instead of svn diff.
+        (isBinaryMimeType($)): Added.
+        (manufacturePatchForAdditionWithHistory($$)): Added.
+        * Scripts/svn-unapply: Identify copied files and handle those after unapplying all other patches.
+
 2006-12-29  Eric Seidel  <eric@eseidel.com>
 

trunk/WebKitTools/Scripts/svn-apply

@@ -44 +44 @@
 #       the patch to today's date using $changeLogTimeZone.
 #   Handles binary files (requires patches made by svn-create-patch).
+#   Handles copied and moved files (requires patches made by svn-create-patch).
 #
 # Missing features:
 #
 #   Handle property changes.
-#   Handle file moves (would require patches made by svn-create-patch).
+#   Handle copied and moved directories (would require patches made by svn-create-patch).
 #   When doing a removal, check that old file matches what's being removed.
 #   Notice a patch that's being applied at the "wrong level" and make it work anyway.
@@ -94 +95 @@
 
 my %checkedDirectories;
+my %copiedFiles;
 my @patches;
 my %versions;
 
+my $copiedFromPath;
 my $indexPath;
 my $patch;
@@ -105 +108 @@
         $indexPath = $1;
         if ($patch) {
-            push @patches, $patch;
+            if (!$copiedFromPath) {
+                push @patches, $patch;
+            }
+            $copiedFromPath = "";
             $patch = "";
         }
@@ -113 +119 @@
         s/\S+$/$indexPath/ if /^diff/;
         s/^--- \S+/--- $indexPath/;
+        if (/^--- .+\(from (\S+):(\d+)\)$/) {
+            $copiedFromPath = $1;
+            $copiedFiles{$indexPath} = $copiedFromPath;
+            $versions{$copiedFromPath} = $2 if ($2 != 0);
+        }
+        elsif (/^--- .+\(revision (\d+)\)$/) {
+            $versions{$indexPath} = $1 if ($1 != 0);
+        }
         if (s/^\+\+\+ \S+/+++ $indexPath/) {
             $indexPath = "";
         }
     }
-    if (/^--- .+\(revision (\d+)\)$/) {
-        $versions{$indexPath} = $1 if( $1 != 0 );
-    }
     $patch .= $_;
     $patch .= "\n";
 }
 
-push @patches, $patch if $patch;
+if ($patch && !$copiedFromPath) {
+    push @patches, $patch;
+}
 
 if ($merge) {
@@ -131 +144 @@
         system "svn", "update", "-r", $versions{$file}, $file;
     }
+}
+
+# Handle copied and moved files first since moved files may have their source deleted before the move.
+for my $file (keys %copiedFiles) {
+    addDirectoriesIfNeeded(dirname($file));
+    system "svn", "copy", $copiedFiles{$file}, $file;
 }
 

trunk/WebKitTools/Scripts/svn-create-patch

@@ -35 +35 @@
 #   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 moved files.
+#   Handle copied and moved directories.
 
 use strict;
@@ -54 +55 @@
 
 sub canonicalizePath($);
+sub findMimeType($);
+sub findModificationType($);
+sub findSourceFileAndRevision($);
 sub fixChangeLogPatch($);
-sub generateDiff($);
+sub generateDiff($$$);
 sub generateFileList($\%\%);
+sub isBinaryMimeType($);
+sub manufacturePatchForAdditionWithHistory($$);
 sub numericcmp($$);
 sub outputBinaryContent($);
@@ -80 +86 @@
 # Generate the diff for text files, then binary files, for easy reviewing
 for my $file (sort pathcmp keys %textFiles) {
-    generateDiff($file);
+    generateDiff($file, $textFiles{$file}, 0);
 }
 for my $file (sort pathcmp keys %binaryFiles) {
-    generateDiff($file);
+    generateDiff($file, $binaryFiles{$file}, 1);
 }
 
@@ -106 +112 @@
     }
     return ($#dirs >= 0) ? File::Spec->catdir(@dirs) : ".";
+}
+
+sub findMimeType($)
+{
+    my ($file) = @_;
+    open PROPGET, "svn propget svn:mime-type '$file' |" or die;
+    my $mimeType = <PROPGET>;
+    close PROPGET;
+    chomp $mimeType if $mimeType;
+    return $mimeType;
+}
+
+sub findModificationType($)
+{
+    my ($stat) = @_;
+    my $fileStat = substr($stat, 0, 1);
+    my $propertyStat = substr($stat, 1, 1);
+    if ($fileStat eq "A") {
+        my $additionWithHistory = substr($stat, 3, 1);
+        return $additionWithHistory eq "+" ? "additionWithHistory" : "addition";
+    }
+    return "modification" if ($fileStat eq "M" || $propertyStat eq "M");
+    return "deletion" if ($fileStat eq "D");
+    return undef;
+}
+
+sub findSourceFileAndRevision($)
+{
+    my ($file) = @_;
+    my $baseUrl;
+    open INFO, "svn info . |" or die;
+    while (<INFO>) {
+        if (/^URL: (.+)/) {
+            $baseUrl = $1;
+            last;
+        }
+    }
+    close INFO;
+    my $sourceFile;
+    my $sourceRevision;
+    open INFO, "svn info '$file' |" or die;
+    while (<INFO>) {
+        if (/^Copied From URL: (.+)/) {
+            $sourceFile = substr($1, length($baseUrl) + 1);
+        } elsif (/^Copied From Rev: ([0-9]+)/) {
+            $sourceRevision = $1;
+        }
+    }
+    close INFO;
+    return ($sourceFile, $sourceRevision);
 }
 
@@ -159 +215 @@
 }
 
-sub generateDiff($)
-{
-    my ($file) = @_;
-    my $errors = "";
-    my $isBinary;
+sub generateDiff($$$)
+{
+    my ($file, $modificationType, $isBinary) = @_;
     my $patch;
+    if ($modificationType eq "additionWithHistory") {
+        manufacturePatchForAdditionWithHistory($file, $isBinary);
+    }
     open DIFF, "svn diff --diff-cmd diff -x -uNp '$file' |" or die;
     while (<DIFF>) {
-        $isBinary = 1 if (/^Cannot display: file marked as a binary type\.$/);
         $patch .= $_;
     }
     close DIFF;
     $patch = fixChangeLogPatch($patch) if basename($file) eq "ChangeLog";
-    print $patch;
+    print $patch if $patch;
     if ($isBinary) {
-        print "\n" if $patch =~ m/\n\S+$/m;
+        print "\n" if ($patch && $patch =~ m/\n\S+$/m);
         outputBinaryContent($file);
     }
-    print STDERR $errors;
 }
 
 sub generateFileList($\%\%)
 {
-    my ($path, $textFiles, $binaryFiles) = @_;
-    my $indexPath;
-    my $isBinary;
-    open DIFF, "svn diff --diff-cmd diff -x -uNp '$path' |" or die;
-    while (<DIFF>) {
-        if (/^Index: (.*)/) {
-            my $newIndexPath = $1;
-            if ($indexPath) {
-                if ($isBinary) {
-                    $binaryFiles->{$indexPath} = 1;
-                } else {
-                    $textFiles->{$indexPath} = 1;
-                }
-            }
-            $indexPath = $newIndexPath;
-            $isBinary = 0;
-        }
-        if (/^Cannot display: file marked as a binary type\.$/) {
-            $isBinary = 1;
-        }
-    }
-    close DIFF;
-    # Handle last patch
-    if ($indexPath) {
-        if ($isBinary) {
-            $binaryFiles->{$indexPath} = 1;
+    my ($statPath, $textFiles, $binaryFiles) = @_;
+    open STAT, "svn stat '$statPath' |" or die;
+    while (my $line = <STAT>) {
+        chomp $line;
+        my $stat = substr($line, 0, 7);
+        my $path = substr($line, 7);
+        my $modificationType = findModificationType($stat);
+        if ($modificationType) {
+            if (isBinaryMimeType($path)) {
+                $binaryFiles->{$path} = $modificationType;
+            } else {
+                $textFiles->{$path} = $modificationType;
+            }
         } else {
-            $textFiles->{$indexPath} = 1;
-        }
+            print STDERR $line, "\n";
+        }
+    }
+    close STAT;
+}
+
+sub isBinaryMimeType($)
+{
+    my ($file) = @_;
+    my $mimeType = findMimeType($file);
+    return 0 if (!$mimeType || substr($mimeType, 0, 5) eq "text/");
+    return 1;
+}
+
+sub manufacturePatchForAdditionWithHistory($$)
+{
+    my ($file, $isBinary) = @_;
+    print "Index: ${file}\n";
+    print "=" x 67, "\n";
+    my ($sourceFile, $sourceRevision) = findSourceFileAndRevision($file);
+    print "--- ${file}\t(revision ${sourceRevision})\t(from ${sourceFile}:${sourceRevision})\n";
+    print "+++ ${file}\t(working copy)\n";
+    if ($isBinary) {
+        print "\nCannot display: file marked as a binary type.\n";
+        my $mimeType = findMimeType($file);
+        print "svn:mime-type = ${mimeType}\n\n";
+    } else {
+        print `svn cat -r${sourceRevision} ${sourceFile} | diff -u /dev/null - | tail +3`;
     }
 }

trunk/WebKitTools/Scripts/svn-unapply

@@ -41 +41 @@
 #       the patch before it is applied (svn-apply sets it when applying a patch).
 #   Handles binary files (requires patches made by svn-create-patch).
+#   Handles copied and moved files (requires patches made by svn-create-patch).
 #
 # Missing features:
 #
 #   Handle property changes.
-#   Handle file moves (would require patches made by svn-create-patch).
+#   Handle copied and moved directories (would require patches made by svn-create-patch).
 #   Use version numbers in the patch file and do a 3-way merge.
 #   When reversing an addition, check that the file matches what's being removed.
@@ -77 +78 @@
 }
 
+my @copiedFiles;
 my %directoriesToCheck;
 
+my $copiedFromPath;
 my $indexPath;
 my $patch;
@@ -87 +90 @@
         $indexPath = $1;
         if ($patch) {
-            patch($patch);
+            if ($copiedFromPath) {
+                push @copiedFiles, $patch;
+            } else {
+                patch($patch);
+            }
+            $copiedFromPath = "";
             $patch = "";
         }
@@ -94 +102 @@
         # Fix paths on diff, ---, and +++ lines to match preceding Index: line.
         s/^--- \S+/--- $indexPath/;
+        if (/^--- .+\(from (\S+):\d+\)$/) {
+            $copiedFromPath = $1;
+        }
         if (s/^\+\+\+ \S+/+++ $indexPath/) {
             $indexPath = "";
@@ -101 +112 @@
     $patch .= "\n";
 }
-patch($patch);
+
+if ($patch) {
+    if ($copiedFromPath) {
+        push @copiedFiles, $patch;
+    } else {
+        patch($patch);
+    }
+}
+
+# Handle copied and moved files last since they may have had post-copy changes that have now been unapplied
+for $patch (@copiedFiles) {
+    patch($patch);
+}
 
 revertDirectories();
@@ -181 +204 @@
     my $isBinary = 0;
 
-    $addition = 1 if $patch =~ /\n--- .+\(revision 0\)\n/;
+    $addition = 1 if ($patch =~ /\n--- .+\(revision 0\)\n/ || $patch =~ /\n@@ -0,0 .* @@/);
     $deletion = 1 if $patch =~ /\n@@ .* \+0,0 @@/;
     $isBinary = 1 if $patch =~ /\nCannot display: file marked as a binary type\./;