2009-07-08 Maciej Stachowiak <mjs@apple.com>

        Reviewed by Mark Rowe.

        Make prepare-ChangeLog less shouty
        https://bugs.webkit.org/show_bug.cgi?id=27098

        * Scripts/prepare-ChangeLog:

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

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index aa8965908c406dda017c682db0d253b5a780812d..5cb39f17366cfe3138e8dbe1250aee51ec53cde0 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2009-07-08  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Mark Rowe.
+
+        Make prepare-ChangeLog less shouty
+        https://bugs.webkit.org/show_bug.cgi?id=27098
+
+        * Scripts/prepare-ChangeLog:
+
 2009-07-08  David Kilzer  <ddkilzer@apple.com>
 
         Bug 27083: bugzilla.py: Clean up bug_server use

diff --git a/WebKitTools/Scripts/prepare-ChangeLog b/WebKitTools/Scripts/prepare-ChangeLog
index 31d5a4038746c9783ac55554e19fa484e78f29da..e781e83c0550e3cad5a28f3440217e3d7e5d879e 100755 (executable)
--- a/WebKitTools/Scripts/prepare-ChangeLog
+++ b/WebKitTools/Scripts/prepare-ChangeLog
@@ -334,21 +334,19 @@ foreach my $prefix (sort keys %files) {
     print CHANGE_LOG normalizeLineEndings("        Reviewed by $reviewer.\n\n", $endl);
     print CHANGE_LOG normalizeLineEndings($description . "\n", $endl) if $description;
 
-    $bugDescription = "SHORT DESCRIPTION/BUG TITLE GOES HERE (OOPS!)" unless $bugDescription;
-    print CHANGE_LOG normalizeLineEndings("        $bugDescription\n", $endl);
-
-    $bugURL = "BUG URL GOES HERE (pass --bug= to autofill)" unless $bugURL;
-    print CHANGE_LOG normalizeLineEndings("        $bugURL\n\n", $endl);
+    $bugDescription = "Need a short description and 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 "\n";
 
     # We could pre-populate this with the git commit log or with the bug description.
-    print CHANGE_LOG normalizeLineEndings("        DETAILED DESCRIPTION OF THE CHANGES GOES HERE. (OOPS!) SEE:\n", $endl);
-    print CHANGE_LOG normalizeLineEndings("        http://webkit.org/coding/contributing.html FOR MORE INFORMATION\n\n", $endl);
+    print ("-- Please remember to include a detailed description in your ChangeLog entry. --\n-- See <http://webkit.org/coding/contributing.html> for more info --\n");
 
     if ($prefix =~ m/WebCore/ || `pwd` =~ m/WebCore/) {
         if ($didChangeRegressionTests) {
             print CHANGE_LOG normalizeLineEndings(testListForChangeLog(sort @addedRegressionTests), $endl);
         } else {
-            print CHANGE_LOG normalizeLineEndings("        LIST OF TESTS, OR EXPLANATION WHY TESTING IS IMPOSSIBLE GOES HERE (OOPS!)\n\n", $endl);
+            print CHANGE_LOG normalizeLineEndings("        No new tests. (OOPS!)\n\n", $endl);
         }
     }