Changeset 46095 in webkit

Timestamp:

Jul 18, 2009 11:50:02 AM (15 years ago)

Author:

pkasting@chromium.org

Message:

2009-07-17 Peter Kasting <​pkasting@google.com>

Reviewed by David Kilzer.

​https://bugs.webkit.org/show_bug.cgi?id=27323
Further improve non-Cygwin SVN support.

• Scripts/prepare-ChangeLog: Harmless change to be consistent with other places that consume whitespace at the end of svn output.
• Scripts/resolve-ChangeLogs: Add support for SVN 1.6. Slightly optimize svn info parsing based on technique in svn-create-patch. Normalize paths and consume whitespace in the same way as prepare-ChangeLog, for Windows systems with a non-Cygwin SVN. Force diff and patch to run in binary mode so that they won't "intelligently" screw up line endings.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/prepare-ChangeLog (modified) (4 diffs)
• Scripts/resolve-ChangeLogs (modified) (8 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-07-17  Peter Kasting  <pkasting@google.com>
+
+        Reviewed by David Kilzer.
+
+        https://bugs.webkit.org/show_bug.cgi?id=27323
+        Further improve non-Cygwin SVN support.
+
+        * Scripts/prepare-ChangeLog: Harmless change to be consistent with other
+          places that consume whitespace at the end of svn output.
+        * Scripts/resolve-ChangeLogs: Add support for SVN 1.6.  Slightly
+          optimize svn info parsing based on technique in svn-create-patch.
+          Normalize paths and consume whitespace in the same way as
+          prepare-ChangeLog, for Windows systems with a non-Cygwin SVN.  Force
+          diff and patch to run in binary mode so that they won't
+          "intelligently" screw up line endings.
+
 2009-07-18  Simon Fraser  <simon.fraser@apple.com>
 

trunk/WebKitTools/Scripts/prepare-ChangeLog

@@ -1281 +1281 @@
 sub diffHeaderFormat()
 {
-    return qr/^Index: (\S+)\r?\n?$/ if $isSVN;
+    return qr/^Index: (\S+)\s*$/ if $isSVN;
     return qr/^diff --git a\/.+ b\/(.+)$/ if $isGit;
 }
@@ -1291 +1291 @@
     open INFO, "$SVN info . |" or die;
     while (<INFO>) {
-        if (/^URL: (.*\S+)\r?\n?$/) {
+        if (/^URL: (.*\S+)\s*$/) {
             $baseUrl = $1;
         }
@@ -1299 +1299 @@
     open INFO, "$SVN info '$file' |" or die;
     while (<INFO>) {
-        if (/^Copied From URL: (.*\S+)\r?\n?$/) {
+        if (/^Copied From URL: (.*\S+)\s*$/) {
             $sourceFile = File::Spec->abs2rel($1, $baseUrl);
         }
@@ -1320 +1320 @@
             my $matches;
             if (eval "v$svnVersion" ge v1.6) {
-                $matches = /^([ACDMR]).{6} (.*\S+)\r?\n?$/;
+                $matches = /^([ACDMR]).{6} (.*\S+)\s*$/;
                 $status = $1;
                 $file = $2;
             } else {
-                $matches = /^([ACDMR]).{5} (.*\S+)\r?\n?$/;
+                $matches = /^([ACDMR]).{5} (.*\S+)\s*$/;
                 $status = $1;
                 $file = $2;

trunk/WebKitTools/Scripts/resolve-ChangeLogs

@@ -55 +55 @@
 sub showStatus($;$);
 sub usageAndExit();
+sub normalizePath($);
 
 my $isGit = isGit();
@@ -61 +62 @@
 my $SVN = "svn";
 my $GIT = "git";
+
+my $svnVersion = `svn --version --quiet` if $isSVN;
 
 my $fixMerged;
@@ -165 +168 @@
         open INFO, "-|", $SVN, "info", $file || die;
         while (my $line = <INFO>) {
-            $currentRevision = $1 if $line =~ m/^Revision: ([0-9]+)/;
+            if ($line =~ m/^Revision: ([0-9]+)/) {
+                $currentRevision = $1;
+                { local $/ = undef; <INFO>; }  # Consume rest of input.
+            }
         }
         close INFO;
@@ -237 +243 @@
     while (<STAT>) {
         if ($isSVN) {
-            if (/^([C]).{5} (.+)$/) {
-                my $file = findChangeLog($2);
+            my $matches;
+            my $file;
+            if (eval "v$svnVersion" ge v1.6) {
+                $matches = /^([C]).{6} (.*\S+)\s*$/;
+                $file = $2;
+            } else {
+                $matches = /^([C]).{5} (.*\S+)\s*$/;
+                $file = $2;
+            }
+            if ($matches) {
+                $file = findChangeLog(normalizePath($file));
                 push @results, $file if $file;
             } else {
@@ -245 +260 @@
         } elsif ($isGit) {
             if (/^([U])\t(.+)$/) {
-                my $file = findChangeLog($2);
+                my $file = findChangeLog(normalizePath($2));
                 push @results, $file if $file;
             } else {
@@ -420 +435 @@
         rename($fileOlder, "$fileOlder.save");
     } else {
-        open(DIFF, "-|", qw(diff -u), $fileOlder, $fileMine) || die;
+        open(DIFF, "-|", qw(diff -u -a --binary), $fileOlder, $fileMine) || die;
         $patch = <DIFF>;
         close(DIFF);
@@ -428 +443 @@
     unlink("${fileNewer}.rej");
 
-    open(PATCH, "| patch --fuzz=3 $fileNewer > /dev/null") || die;
+    open(PATCH, "| patch --fuzz=3 --binary $fileNewer > /dev/null") || die;
     print PATCH fixChangeLogPatch($patch);
     close(PATCH);
@@ -535 +550 @@
     }
 }
+
+sub normalizePath($)
+{
+    my ($path) = @_;
+    $path =~ s/\\/\//g;
+    return $path;
+}