WebKit:

        Reviewed by darin.

        http://bugzilla.opendarwin.org/show_bug.cgi?id=9290
        Teach svn-apply and svn-unapply to patch ChangeLogs cleanly

        * Scripts/svn-apply: Fixed to apply ChangeLog patches without failing.
        * Scripts/svn-unapply: Ditto.  Also simplified reversing a deletion.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@14710 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f21134003213a3573d9958ae92ad107cdbd0e26b..f87a488bf17681c1c436a30def6be9d840a280db 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2006-06-03  David Kilzer  <ddkilzer@kilzer.net>
+
+        Reviewed by darin.
+
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=9290
+        Teach svn-apply and svn-unapply to patch ChangeLogs cleanly
+
+        * Scripts/svn-apply: Fixed to apply ChangeLog patches without failing.
+        * Scripts/svn-unapply: Ditto.  Also simplified reversing a deletion.
+
 2006-06-03  Steve Falkenburg  <sfalken@apple.com>
 
         Reviewed by hyatt.

diff --git a/WebKitTools/Scripts/svn-apply b/WebKitTools/Scripts/svn-apply
index 98d9cf0a875effdb97b834c85d526ac1fd63cd69..f96d7b38c38257ef0eb1135ae007f8ce00c3a52c 100755 (executable)
--- a/WebKitTools/Scripts/svn-apply
+++ b/WebKitTools/Scripts/svn-apply
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-# Copyright (C) 2005 Apple Computer, Inc.  All rights reserved.
+# Copyright (C) 2005, 2006 Apple Computer, Inc.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -37,6 +37,7 @@
 #   Paths from Index: lines are used rather than the paths on the patch lines, which
 #       makes patches generated by "cvs diff" work (increasingly unimportant since we
 #       use Subversion now).
+#   ChangeLog patches use --fuzz=3 to prevent rejects.
 #
 # Missing features:
 #
@@ -45,7 +46,6 @@
 #   Handle file moves (requires 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.
-#   Do a smart merge on ChangeLog files instead of just doing a normal patch.
 #   Do a dry run on the whole patch and don't do anything if part of the patch is
 #       going to fail (probably too strict unless we do the ChangeLog thing).
 
@@ -107,6 +107,16 @@ for $patch (@patches) {
     patch($patch);
 }
 
+sub applyPatch
+{
+    my ($patch, $fullpath, $options) = @_;
+    $options = [] if (! $options);
+    my $command = "patch " . join(" ", "-p0", @{$options});
+    open PATCH, "| $command" or die "Failed to patch $fullpath\n";
+    print PATCH $patch;
+    close PATCH;
+}
+
 sub patch
 {
     my ($patch) = @_;
@@ -123,9 +133,14 @@ sub patch
 
     if (!$addition && !$deletion) {
         # Standard patch, patch tool can handle this.
-        open PATCH, "| patch -p0" or die "Failed to patch $fullpath\n";
-        print PATCH $patch;
-        close PATCH;
+        if ($base eq "ChangeLog") {
+            my $changeLogDotOrigExisted = -f "${fullpath}.orig";
+            applyPatch($patch, $fullpath, ["--fuzz=3"]);
+            unlink("${fullpath}.orig") if (! $changeLogDotOrigExisted);
+        }
+        else {
+            applyPatch($patch, $fullpath);
+        }
     } else {
         # Either a deletion or an addition.
 

diff --git a/WebKitTools/Scripts/svn-unapply b/WebKitTools/Scripts/svn-unapply
index 3085570b367acd6ac460c6e0868cc8b32a03f4e3..14fa4f0d2f6c9f57b518161f2486af911517c3c5 100755 (executable)
--- a/WebKitTools/Scripts/svn-unapply
+++ b/WebKitTools/Scripts/svn-unapply
@@ -35,6 +35,7 @@
 #   Paths from Index: lines are used rather than the paths on the patch lines, which
 #       makes patches generated by "cvs diff" work (increasingly unimportant since we
 #       use Subversion now).
+#   ChangeLog patches use --fuzz=3 to prevent rejects.
 #
 # Missing features:
 #
@@ -44,7 +45,6 @@
 #   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.
 #   Notice a patch that's being unapplied at the "wrong level" and make it work anyway.
-#   Do a smart merge on ChangeLog files instead of just doing a normal patch.
 #   Do a dry run on the whole patch and don't do anything if part of the patch is
 #       going to fail (probably too strict unless we do the ChangeLog thing).
 
@@ -77,11 +77,24 @@ while (<>) {
 }
 patch($patch);
 
+sub unapplyPatch
+{
+    my ($patch, $fullpath, $options) = @_;
+    $options = [] if (! $options);
+    my $command = "patch " . join(" ", "-p0", "-R", @{$options});
+    open PATCH, "| $command" or die "Failed to patch $fullpath\n";
+    print PATCH $patch;
+    close PATCH;
+}
+
 sub patch
 {
     my ($patch) = @_;
     return if !$patch;
 
+    $patch =~ m|^Index: ((([^/\n]*/)*)([^/\n]+))| or die "Failed to find Index: in \"$patch\"\n";
+    my ($fullpath, $prefix, $base) = ($1, $2, $4);
+
     my $deletion = 0;
     my $addition = 0;
 
@@ -90,35 +103,25 @@ sub patch
 
     if (!$addition && !$deletion) {
         # Standard patch, patch tool can handle this.
-        open PATCH, "| patch -p0 -R" or die;
-        print PATCH $patch;
-        close PATCH;
+        if ($base eq "ChangeLog") {
+            my $changeLogDotOrigExisted = -f "${fullpath}.orig";
+            unapplyPatch($patch, $fullpath, ["--fuzz=3"]);
+            unlink("${fullpath}.orig") if (! $changeLogDotOrigExisted);
+        }
+        else {
+            unapplyPatch($patch, $fullpath);
+        }
     } else {
         # Either a deletion or an addition.
 
         # Change directory down into the directory in question.
-        $patch =~ m|^Index: (([^/\n]*/)*)([^/\n]+)| or die "Failed to find Index: in patch";
-        my $prefix = $1;
-        my $base = $3;
         if ($prefix) {
             chdir $prefix or die "Failed to chdir to $prefix";
         }
 
         if ($deletion) {
             # Reverse a deletion.
-            system "svn", "add", "$base";
-            my $file = $patch;
-            if ($file !~ s/^(.*\n)*@@[^\n]+@@\n//) {
-                # Empty file.
-                $file = "";
-            } else {
-                # Non-empty file: Remove leading - signs.
-                $file =~ s/^-//;
-                $file =~ s/\n-/\n/g;
-            }
-            open FILE, ">", $base or die;
-            print FILE $file;
-            close FILE;
+            system "svn", "revert", "$base";
         } else {
             # Reverse an addition.
             system "svn", "rm", "--force", $base;