Changeset 56471 in webkit

Timestamp:

Mar 24, 2010 4:50:18 PM (14 years ago)

Author:

ddkilzer@apple.com

Message:

<​http://webkit.org/b/36560> resolve-ChangeLogs: move mergeChanges() into VCSUtils package

Reviewed by Eric Seidel.

• Scripts/VCSUtils.pm:

(mergeChangeLogs): Copied from mergeChanges() in
resolve-ChangeLogs and renamed. Added method documentation.
Fixed bug found by new tests where the original file to be
patched was deleted when cleaning up after a traditinal rejected
patch failed to apply.

• Scripts/resolve-ChangeLogs: Switched to using

mergeChangeLogs().
(mergeChanges): Moved to VCSUtils.pm and renamed to
mergeChangeLogs().

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

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/VCSUtils.pm (modified) (2 diffs)
• Scripts/resolve-ChangeLogs (modified) (4 diffs)
• Scripts/webkitperl/VCSUtils_unittest/mergeChangeLogs.pl (added)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-24  David Kilzer  <ddkilzer@apple.com>
+
+        <http://webkit.org/b/36560> resolve-ChangeLogs: move mergeChanges() into VCSUtils package
+
+        Reviewed by Eric Seidel.
+
+        * Scripts/VCSUtils.pm:
+        (mergeChangeLogs): Copied from mergeChanges() in
+        resolve-ChangeLogs and renamed.  Added method documentation.
+        Fixed bug found by new tests where the original file to be
+        patched was deleted when cleaning up after a traditinal rejected
+        patch failed to apply.
+        * Scripts/resolve-ChangeLogs: Switched to using
+        mergeChangeLogs().
+        (mergeChanges): Moved to VCSUtils.pm and renamed to
+        mergeChangeLogs().
+        * Scripts/webkitperl/VCSUtils_unittest/mergeChangeLogs.pl: Added.
+
 2010-03-24  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/Scripts/VCSUtils.pm

@@ -62 +62 @@
         &isSVNVersion16OrNewer
         &makeFilePathRelative
+        &mergeChangeLogs
         &normalizePath
         &parsePatch
@@ -816 +817 @@
 }
 
+# Merge ChangeLog patches using a three-file approach.
+#
+# This is used by resolve-ChangeLogs when it's operated as a merge driver
+# and when it's used to merge conflicts after a patch is applied or after
+# an svn update.
+#
+# It's also used for traditional rejected patches.
+#
+# Args:
+#   $fileMine:  The merged version of the file.  Also known in git as the
+#               other branch's version (%B) or "ours".
+#               For traditional patch rejects, this is the *.rej file.
+#   $fileOlder: The base version of the file.  Also known in git as the
+#               ancestor version (%O) or "base".
+#               For traditional patch rejects, this is the *.orig file.
+#   $fileNewer: The current version of the file.  Also known in git as the
+#               current version (%A) or "theirs".
+#               For traditional patch rejects, this is the original-named
+#               file.
+#
+# Returns 1 if merge was successful, else 0.
+sub mergeChangeLogs($$$)
+{
+    my ($fileMine, $fileOlder, $fileNewer) = @_;
+
+    my $traditionalReject = $fileMine =~ /\.rej$/ ? 1 : 0;
+
+    local $/ = undef;
+
+    my $patch;
+    if ($traditionalReject) {
+        open(DIFF, "<", $fileMine) or die $!;
+        $patch = <DIFF>;
+        close(DIFF);
+        rename($fileMine, "$fileMine.save");
+        rename($fileOlder, "$fileOlder.save");
+    } else {
+        open(DIFF, "-|", qw(diff -u -a --binary), $fileOlder, $fileMine) or die $!;
+        $patch = <DIFF>;
+        close(DIFF);
+    }
+
+    unlink("${fileNewer}.orig");
+    unlink("${fileNewer}.rej");
+
+    open(PATCH, "| patch --fuzz=3 --binary $fileNewer > " . File::Spec->devnull()) or die $!;
+    print PATCH ($traditionalReject ? $patch : fixChangeLogPatch($patch));
+    close(PATCH);
+
+    my $result;
+
+    # Refuse to merge the patch if it did not apply cleanly
+    if (-e "${fileNewer}.rej") {
+        unlink("${fileNewer}.rej");
+        if (-f "${fileNewer}.orig") {
+            unlink($fileNewer);
+            rename("${fileNewer}.orig", $fileNewer);
+        }
+        $result = 0;
+    } else {
+        unlink("${fileNewer}.orig");
+        $result = 1;
+    }
+
+    if ($traditionalReject) {
+        rename("$fileMine.save", $fileMine);
+        rename("$fileOlder.save", $fileOlder);
+    }
+
+    return $result;
+}
+
 sub gitConfig($)
 {

trunk/WebKitTools/Scripts/resolve-ChangeLogs

@@ -50 +50 @@
 sub hasGitUnmergedFiles();
 sub isInGitFilterBranch();
-sub mergeChanges($$$);
 sub parseFixMerged($$;$);
 sub removeChangeLogArguments($);
@@ -131 +130 @@
 } elsif ($mergeDriver) {
     my ($base, $theirs, $ours) = @ARGV;
-    if (mergeChanges($ours, $base, $theirs)) {
+    if (mergeChangeLogs($ours, $base, $theirs)) {
         unlink($ours);
         copy($theirs, $ours) or die $!;
@@ -402 +401 @@
 }
 
-sub mergeChanges($$$)
-{
-    my ($fileMine, $fileOlder, $fileNewer) = @_;
-
-    my $traditionalReject = $fileMine =~ /\.rej$/ ? 1 : 0;
-
-    local $/ = undef;
-
-    my $patch;
-    if ($traditionalReject) {
-        open(DIFF, "<", $fileMine) or die $!;
-        $patch = <DIFF>;
-        close(DIFF);
-        rename($fileMine, "$fileMine.save");
-        rename($fileOlder, "$fileOlder.save");
-    } else {
-        open(DIFF, "-|", qw(diff -u -a --binary), $fileOlder, $fileMine) or die $!;
-        $patch = <DIFF>;
-        close(DIFF);
-    }
-
-    unlink("${fileNewer}.orig");
-    unlink("${fileNewer}.rej");
-
-    open(PATCH, "| patch --fuzz=3 --binary $fileNewer > " . File::Spec->devnull()) or die $!;
-    print PATCH fixChangeLogPatch($patch);
-    close(PATCH);
-
-    my $result;
-
-    # Refuse to merge the patch if it did not apply cleanly
-    if (-e "${fileNewer}.rej") {
-        unlink("${fileNewer}.rej");
-        unlink($fileNewer);
-        rename("${fileNewer}.orig", $fileNewer);
-        $result = 0;
-    } else {
-        unlink("${fileNewer}.orig");
-        $result = 1;
-    }
-
-    if ($traditionalReject) {
-        rename("$fileMine.save", $fileMine);
-        rename("$fileOlder.save", $fileOlder);
-    }
-
-    return $result;
-}
-
 sub parseFixMerged($$;$)
 {
@@ -492 +442 @@
     return unless $fileMine && $fileOlder && $fileNewer;
 
-    if (mergeChanges($fileMine, $fileOlder, $fileNewer)) {
+    if (mergeChangeLogs($fileMine, $fileOlder, $fileNewer)) {
         if ($file ne $fileNewer) {
             unlink($file);