WebKitTools:

        Reviewed by Timothy.

        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=9964
          Add switch to prepare-ChangeLog to skip svn update of ChangeLog files

        * Scripts/prepare-ChangeLog: Added --[no-]update switch.

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

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 12a35c4f91253fb6ddd27b978572f3f1ff5519b8..ed555304c1df3b19d631678072efced3bcd2f95f 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2006-07-18  David Kilzer  <ddkilzer@kilzer.net>
+
+        Reviewed by Timothy.
+
+        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=9964
+          Add switch to prepare-ChangeLog to skip svn update of ChangeLog files
+
+        * Scripts/prepare-ChangeLog: Added --[no-]update switch.
+
 2006-07-16  David Kilzer  <ddkilzer@kilzer.net>
 
         Reviewed by Darin.

diff --git a/WebKitTools/Scripts/prepare-ChangeLog b/WebKitTools/Scripts/prepare-ChangeLog
index 68e6da07dee9076413d1d6eed3a63f2423c5f756..f0c152aa69c6762a30273fc01ab79995a5240495 100755 (executable)
--- a/WebKitTools/Scripts/prepare-ChangeLog
+++ b/WebKitTools/Scripts/prepare-ChangeLog
@@ -67,17 +67,20 @@ sub processPaths(\@);
 
 my $openChangeLogs = 0;
 my $showHelp = 0;
+my $updateChangeLogs = 1;
 my $spewDiff = $ENV{"PREPARE_CHANGELOG_DIFF"};
 my $parseOptionsResult =
     GetOptions("diff|d!" => \$spewDiff,
                "help|h!" => \$showHelp,
-               "open|o!" => \$openChangeLogs);
+               "open|o!" => \$openChangeLogs,
+               "update!" => \$updateChangeLogs);
 if (!$parseOptionsResult || $showHelp)
   {
     print STDERR basename($0) . " [-d|--diff] [-h|--help] [-o|--open] [svndir1 [svndir2 ...]]\n";
-    print STDERR "  -d|--diff  Spew diff to stdout when running\n";
-    print STDERR "  -h|--help  Show this help message\n";
-    print STDERR "  -o|--open  Open ChangeLogs in an editor when done\n";
+    print STDERR "  -d|--diff      Spew diff to stdout when running\n";
+    print STDERR "  -h|--help      Show this help message\n";
+    print STDERR "  -o|--open      Open ChangeLogs in an editor when done\n";
+    print STDERR "  --[no-]update  Update ChangeLogs from svn before adding entry (default: update)\n";
     exit 1;
   }
 
@@ -289,7 +292,7 @@ foreach my $prefix (sort keys %files)
   {
     $logs .= " ${prefix}ChangeLog";
   }
-if ($logs)
+if ($logs && $updateChangeLogs)
   {
     print STDERR "  Running 'svn update' to update ChangeLog files.\n";
     open ERRORS, "$SVN update -q$logs |" or die "The svn update of ChangeLog files failed: $!.\n";