[webkit-changes] [154406] trunk/Tools

Wed, 21 Aug 2013 13:30:34 -0700

Title: [154406] trunk/Tools
Revision
154406
Author
[email protected]
Date
2013-08-21 13:30:40 -0700 (Wed, 21 Aug 2013)

Log Message

Revert http://trac.webkit.org/changeset/154022, as it failed to update
a variety of scripts that depended on the old format.

See https://bugs.webkit.org/show_bug.cgi?id=120131 for one such example.

* Scripts/prepare-ChangeLog:
(main):
(generateNewChangeLogs):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (154405 => 154406)


--- trunk/Tools/ChangeLog	2013-08-21 19:51:20 UTC (rev 154405)
+++ trunk/Tools/ChangeLog	2013-08-21 20:30:40 UTC (rev 154406)
@@ -1,3 +1,14 @@
+2013-08-21  Tim Horton  <[email protected]>
+
+        Revert http://trac.webkit.org/changeset/154022, as it failed to update
+        a variety of scripts that depended on the old format.
+
+        See https://bugs.webkit.org/show_bug.cgi?id=120131 for one such example.
+
+        * Scripts/prepare-ChangeLog:
+        (main):
+        (generateNewChangeLogs):
+
 2013-08-21  Brent Fulgham  <[email protected]>
 
         [Windows] Unreviewed gardening: WebInspector should always be enabled for WinLauncher.

Modified: trunk/Tools/Scripts/prepare-ChangeLog (154405 => 154406)


--- trunk/Tools/Scripts/prepare-ChangeLog	2013-08-21 19:51:20 UTC (rev 154405)
+++ trunk/Tools/Scripts/prepare-ChangeLog	2013-08-21 20:30:40 UTC (rev 154406)
@@ -22,6 +22,7 @@
 #  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
+
 # Perl script to create a ChangeLog entry with names of files
 # and functions from a diff.
 #
@@ -78,7 +79,7 @@
 sub findOriginalFileFromSvn($);
 sub generateFileList(\%$$$);
 sub generateFunctionLists($$$$$);
-sub generateNewChangeLogs($$$$$$$$$$$$);
+sub generateNewChangeLogs($$$$$$$$$$$);
 sub getLatestChangeLogs($);
 sub get_function_line_ranges($$);
 sub get_function_line_ranges_for_cpp($$);
@@ -194,10 +195,8 @@
     $name =~ s/\(.*?\)\s*$//g;
 
     my $bugURL;
-    my $readableBugURL;
     if ($bugNumber) {
         $bugURL = "https://bugs.webkit.org/show_bug.cgi?id=$bugNumber";
-        $readableBugURL = "https://webkit.org/b/$bugNumber";
     }
 
     if ($bugNumber && !$bugDescription) {
@@ -213,7 +212,7 @@
         resolveConflictedChangeLogs($changeLogs);
     }
 
-    generateNewChangeLogs($prefixes, $filesInChangeLog, $addedRegressionTests, $functionLists, $bugURL, $readableBugURL, $bugDescription, $name, $emailAddress, $gitReviewer, $gitCommit, $writeChangeLogs);
+    generateNewChangeLogs($prefixes, $filesInChangeLog, $addedRegressionTests, $functionLists, $bugURL, $bugDescription, $name, $emailAddress, $gitReviewer, $gitCommit, $writeChangeLogs);
 
     if ($writeChangeLogs) {
         print STDERR "-- Please remember to include a detailed description in your ChangeLog entry. --\n-- See <http://webkit.org/coding/contributing.html> for more info --\n";
@@ -460,9 +459,9 @@
     close RESOLVE;
 }
 
-sub generateNewChangeLogs($$$$$$$$$$$$)
+sub generateNewChangeLogs($$$$$$$$$$$)
 {
-    my ($prefixes, $filesInChangeLog, $addedRegressionTests, $functionLists, $bugURL, $readableBugURL, $bugDescription, $name, $emailAddress, $gitReviewer, $gitCommit, $writeChangeLogs) = @_;
+    my ($prefixes, $filesInChangeLog, $addedRegressionTests, $functionLists, $bugURL, $bugDescription, $name, $emailAddress, $gitReviewer, $gitCommit, $writeChangeLogs) = @_;
 
     # Generate new ChangeLog entries and (optionally) write out new ChangeLog files.
     foreach my $prefix (@$prefixes) {
@@ -496,9 +495,9 @@
 
         print CHANGE_LOG normalizeLineEndings($description . "\n", $endl) if $description;
 
-        $bugDescription = "Need a short description (OOPS!)" unless $bugDescription;
-        $readableBugURL = "Need the bug URL (OOPS!)" unless $readableBugURL;
-        print CHANGE_LOG normalizeLineEndings("        <$readableBugURL> $bugDescription\n", $endl);
+        $bugDescription = "Need a short description (OOPS!).\n        Need the bug URL (OOPS!)." unless $bugDescription;
+        print CHANGE_LOG normalizeLineEndings("        $bugDescription\n", $endl) if $bugDescription;
+        print CHANGE_LOG normalizeLineEndings("        $bugURL\n", $endl) if $bugURL;
         print CHANGE_LOG normalizeLineEndings("\n", $endl);
 
         print CHANGE_LOG normalizeLineEndings("        Reviewed by $reviewer.\n\n", $endl);

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to