[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 19f4bf371daffe89c91b84aed74a8110ddae5674
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 6 22:14:10 2010 +0000

    2010-01-06  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Adam Barth.
    
            bugzilla-tool rollout --complete-rollout should make a nicer bug comment
            https://bugs.webkit.org/show_bug.cgi?id=29212
    
            * Scripts/webkitpy/bugzilla.py:
             - Make reopen_bug robust against the bug already being open.
            * Scripts/webkitpy/commands/download.py:
             - Remove dead code from Rollout.
            * Scripts/webkitpy/steps/completerollout.py:
             - Improve the rollout comment.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52870 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c81ec33..1bce659 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-01-06  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
+        bugzilla-tool rollout --complete-rollout should make a nicer bug comment
+        https://bugs.webkit.org/show_bug.cgi?id=29212
+
+        * Scripts/webkitpy/bugzilla.py:
+         - Make reopen_bug robust against the bug already being open.
+        * Scripts/webkitpy/commands/download.py:
+         - Remove dead code from Rollout.
+        * Scripts/webkitpy/steps/completerollout.py:
+         - Improve the rollout comment.
+
 2010-01-06  Andras Becsi  <abecsi at inf.u-szeged.hu>
 
         Reviewed by Darin Adler.
diff --git a/WebKitTools/Scripts/webkitpy/bugzilla.py b/WebKitTools/Scripts/webkitpy/bugzilla.py
index 2d43ffa..77eb5e5 100644
--- a/WebKitTools/Scripts/webkitpy/bugzilla.py
+++ b/WebKitTools/Scripts/webkitpy/bugzilla.py
@@ -559,6 +559,13 @@ class Bugzilla(object):
 
         self.browser.open(self.bug_url_for_bug_id(bug_id))
         self.browser.select_form(name="changeform")
-        self.browser['bug_status'] = ['REOPENED']
+        bug_status = self.browser.find_control("bug_status", type="select")
+        # This is a hack around the fact that ClientForm.ListControl seems to have no simpler way to ask
+        # if a control has an item named "REOPENED" without using exceptions for control flow.
+        possible_bug_statuses = map(lambda item: item.name, bug_status.items)
+        if "REOPENED" in possible_bug_statuses:
+            bug_status.value = ["REOPENED"]
+        else:
+            log("Did not reopen bug %s.  It appears to already be open with status %s." % (bug_id, bug_status.value))
         self.browser['comment'] = comment_text
         self.browser.submit()
diff --git a/WebKitTools/Scripts/webkitpy/commands/download.py b/WebKitTools/Scripts/webkitpy/commands/download.py
index d732f44..86a6420 100644
--- a/WebKitTools/Scripts/webkitpy/commands/download.py
+++ b/WebKitTools/Scripts/webkitpy/commands/download.py
@@ -254,14 +254,6 @@ class Rollout(AbstractSequencedCommmand):
         original_diff = tool.scm().diff_for_revision(revision)
         return parse_bug_id(original_diff)
 
-    @staticmethod
-    def _reopen_bug_after_rollout(tool, bug_id, comment_text):
-        if bug_id:
-            tool.bugs.reopen_bug(bug_id, comment_text)
-        else:
-            log(comment_text)
-            log("No bugs were updated or re-opened to reflect this rollout.")
-
     def execute(self, options, args, tool):
         revision = args[0]
         reason = args[1]
diff --git a/WebKitTools/Scripts/webkitpy/steps/completerollout.py b/WebKitTools/Scripts/webkitpy/steps/completerollout.py
index 5b83d13..311b9a8 100644
--- a/WebKitTools/Scripts/webkitpy/steps/completerollout.py
+++ b/WebKitTools/Scripts/webkitpy/steps/completerollout.py
@@ -55,9 +55,11 @@ class CompleteRollout(MetaStep):
 
         MetaStep.run(self, state)
 
+        commit_comment = bug_comment_from_commit_text(self._tool.scm(), state["commit_text"])
+        comment_text = "Reverted r%s for reason:\n\n%s\n\n%s" % (state["revision"], state["reason"], commit_comment)
+
         if not bug_id:
-            log(state["commit_text"])
-            log("No bugs were updated or re-opened to reflect this rollout.")
+            log(comment_text)
+            log("No bugs were updated.")
             return
-        # FIXME: I'm not sure state["commit_text"] is quite right here.
-        self._tool.bugs.reopen_bug(bug_id, state["commit_text"])
+        self._tool.bugs.reopen_bug(bug_id, comment_text)

-- 
WebKit Debian packaging