[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[eric at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 1933e06df6bf904ba8ab07d31089e8db26c3dc6b
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 8 08:42:44 2010 +0000

    2010-11-08  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Adam Barth.
    
            Add clean-review-queue command to remove closed bugs from the webkit.org/pending-review
            https://bugs.webkit.org/show_bug.cgi?id=49160
    
            Bugzilla doesn't automatically remove r? when a bug gets closed.
            This script takes care of that for webkit.org.
    
            * Scripts/webkitpy/common/net/bugzilla.py:
            * Scripts/webkitpy/tool/commands/upload.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71502 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 068197d..b4f3f31 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-08  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Add clean-review-queue command to remove closed bugs from the webkit.org/pending-review
+        https://bugs.webkit.org/show_bug.cgi?id=49160
+
+        Bugzilla doesn't automatically remove r? when a bug gets closed.
+        This script takes care of that for webkit.org.
+
+        * Scripts/webkitpy/common/net/bugzilla.py:
+        * Scripts/webkitpy/tool/commands/upload.py:
+
 2010-11-07  Fumitoshi Ukai  <ukai at chromium.org>
 
         Unreviewed, rolling out r71474.
diff --git a/WebKitTools/Scripts/webkitpy/common/net/bugzilla.py b/WebKitTools/Scripts/webkitpy/common/net/bugzilla.py
index 1cc8e2e..a7dc1b7 100644
--- a/WebKitTools/Scripts/webkitpy/common/net/bugzilla.py
+++ b/WebKitTools/Scripts/webkitpy/common/net/bugzilla.py
@@ -281,7 +281,7 @@ class BugzillaQueries(object):
         return sum([self._fetch_bug(bug_id).commit_queued_patches()
                     for bug_id in self.fetch_bug_ids_from_commit_queue()], [])
 
-    def _fetch_bug_ids_from_review_queue(self):
+    def fetch_bug_ids_from_review_queue(self):
         review_queue_url = "buglist.cgi?query_format=advanced&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&field0-0-0=flagtypes.name&type0-0-0=equals&value0-0-0=review?"
         return self._fetch_bug_ids_advanced_query(review_queue_url)
 
@@ -289,7 +289,7 @@ class BugzillaQueries(object):
     def fetch_patches_from_review_queue(self, limit=None):
         # [:None] returns the whole array.
         return sum([self._fetch_bug(bug_id).unreviewed_patches()
-            for bug_id in self._fetch_bug_ids_from_review_queue()[:limit]], [])
+            for bug_id in self.fetch_bug_ids_from_review_queue()[:limit]], [])
 
     # NOTE: This is the only client of _fetch_attachment_ids_request_query
     # This method only makes one request to bugzilla.
diff --git a/WebKitTools/Scripts/webkitpy/tool/commands/upload.py b/WebKitTools/Scripts/webkitpy/tool/commands/upload.py
index ed91f5a..e12c8e2 100644
--- a/WebKitTools/Scripts/webkitpy/tool/commands/upload.py
+++ b/WebKitTools/Scripts/webkitpy/tool/commands/upload.py
@@ -92,6 +92,32 @@ class CleanPendingCommit(AbstractDeclarativeCommand):
                 self._tool.bugs.obsolete_attachment(patch.id(), message)
 
 
+# FIXME: This should be share more logic with AssignToCommitter and CleanPendingCommit
+class CleanReviewQueue(AbstractDeclarativeCommand):
+    name = "clean-review-queue"
+    help_text = "Clear r? on obsolete patches so they do not appear in the pending-commit list."
+
+    def execute(self, options, args, tool):
+        queue_url = "http://webkit.org/pending-review"
+        # We do this inefficient dance to be more like webkit.org/pending-review
+        # bugs.queries.fetch_bug_ids_from_review_queue() doesn't return
+        # closed bugs, but folks using /pending-review will see them. :(
+        for patch_id in tool.bugs.queries.fetch_attachment_ids_from_review_queue():
+            patch = self._tool.bugs.fetch_attachment(patch_id)
+            if not patch.review() == "?":
+                continue
+            attachment_obsolete_modifier = ""
+            if patch.is_obsolete():
+                attachment_obsolete_modifier = "obsolete "
+            elif patch.bug().is_closed():
+                bug_closed_explanation = "  If you would like this patch reviewed, please attach it to a new bug (or re-open this bug before marking it for review again)."
+            else:
+                # Neither the patch was obsolete or the bug was closed, next patch...
+                continue
+            message = "Cleared review? from %sattachment %s so that this bug does not appear in %s.%s" % (attachment_obsolete_modifier, patch.id(), queue_url, bug_closed_explanation)
+            self._tool.bugs.obsolete_attachment(patch.id(), message)
+
+
 class AssignToCommitter(AbstractDeclarativeCommand):
     name = "assign-to-committer"
     help_text = "Assign bug to whoever attached the most recent r+'d patch"

-- 
WebKit Debian packaging