Changeset 80211 in webkit

Timestamp:

Mar 3, 2011 12:02:02 AM (13 years ago)

Author:

ojan@chromium.org

Message:

2011-03-02 Ojan Vafai <​ojan@chromium.org>

Reviewed by Adam Barth.

make webkit-patch upload work for security bugs
​https://bugs.webkit.org/show_bug.cgi?id=55655

The problem is that we shell out to prepare-ChangeLog,
which does not authenticate with bugzilla. All it needs from
bugzilla is the bug title though. We just pass it through from
webkit-patch instead.

• Scripts/prepare-ChangeLog:
• Scripts/webkitpy/common/net/bugzilla/bug.py:
• Scripts/webkitpy/tool/steps/preparechangelog.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/prepare-ChangeLog (modified) (4 diffs)
• Scripts/webkitpy/common/net/bugzilla/bug.py (modified) (1 diff)
• Scripts/webkitpy/tool/steps/preparechangelog.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-03-02  Ojan Vafai  <ojan@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        make webkit-patch upload work for security bugs
+        https://bugs.webkit.org/show_bug.cgi?id=55655
+
+        The problem is that we shell out to prepare-ChangeLog,
+        which does not authenticate with bugzilla. All it needs from
+        bugzilla is the bug title though. We just pass it through from
+        webkit-patch instead.
+
+        * Scripts/prepare-ChangeLog:
+        * Scripts/webkitpy/common/net/bugzilla/bug.py:
+        * Scripts/webkitpy/tool/steps/preparechangelog.py:
+
 2011-03-01  Ojan Vafai  <ojan@chromium.org>
 

trunk/Tools/Scripts/prepare-ChangeLog

@@ -100 +100 @@
 my $changeLogTimeZone = "PST8PDT";
 
+my $bugDescription;
 my $bugNumber;
 my $name;
@@ -115 +116 @@
     GetOptions("diff|d!" => \$spewDiff,
                "bug|b:i" => \$bugNumber,
+               "description:s" => \$bugDescription,
                "name:s" => \$name,
                "email:s" => \$emailAddress,
@@ -128 +130 @@
     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";
@@ -255 +258 @@
 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

trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bug.py

@@ -45 +45 @@
 
     def title(self):
+        # FIXME: Do we need to HTML unescape the title?
         return self.bug_dictionary["title"]
 

trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelog.py

@@ -65 +65 @@
         if state.get("bug_id"):
             args.append("--bug=%s" % state["bug_id"])
+            args.append("--description=%s" % self._tool.bugs.fetch_bug(state["bug_id"]).title())
         if self._options.email:
             args.append("--email=%s" % self._options.email)