diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Tools/Scripts/prepare-ChangeLog | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Tools/Scripts/prepare-ChangeLog')
| -rwxr-xr-x | Tools/Scripts/prepare-ChangeLog | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Tools/Scripts/prepare-ChangeLog b/Tools/Scripts/prepare-ChangeLog index b5e2efe..a4b3d6b 100755 --- a/Tools/Scripts/prepare-ChangeLog +++ b/Tools/Scripts/prepare-ChangeLog @@ -99,6 +99,7 @@ sub decodeEntities($); # Project time zone for Cupertino, CA, US my $changeLogTimeZone = "PST8PDT"; +my $bugDescription; my $bugNumber; my $name; my $emailAddress; @@ -114,6 +115,7 @@ my $updateChangeLogs = 1; my $parseOptionsResult = GetOptions("diff|d!" => \$spewDiff, "bug|b:i" => \$bugNumber, + "description:s" => \$bugDescription, "name:s" => \$name, "email:s" => \$emailAddress, "merge-base:s" => \$mergeBase, @@ -127,6 +129,7 @@ my $parseOptionsResult = if (!$parseOptionsResult || $showHelp) { print STDERR basename($0) . " [-b|--bug=<bugid>] [-d|--diff] [-h|--help] [-o|--open] [-g|--git-commit=<committish>] [--git-reviewer=<name>] [svndir1 [svndir2 ...]]\n"; print STDERR " -b|--bug Fill in the ChangeLog bug information from the given bug.\n"; + print STDERR " --description One-line description that matches the bug title.\n"; print STDERR " -d|--diff Spew diff to stdout when running\n"; print STDERR " --merge-base Populate the ChangeLogs with the diff to this branch\n"; print STDERR " -g|--git-commit Populate the ChangeLogs from the specified git commit\n"; @@ -254,10 +257,12 @@ $emailAddress = changeLogEmailAddressFromArgs($emailAddress); print STDERR " Change author: $name <$emailAddress>.\n"; -my $bugDescription; my $bugURL; if ($bugNumber) { $bugURL = "https://bugs.webkit.org/show_bug.cgi?id=$bugNumber"; +} + +if ($bugNumber && !$bugDescription) { my $bugXMLURL = "$bugURL&ctype=xml"; # Perl has no built in XML processing, so we'll fetch and parse with curl and grep # Pass --insecure because some cygwin installs have no certs we don't |