[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 e4f44dc9e3520e4d189ea391ff4f31e7b54c5c0a
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 16 11:54:21 2009 +0000

    2009-11-16  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Implement PatchCollection
            https://bugs.webkit.org/show_bug.cgi?id=31541
    
            This class holds a set of patches and lets clients iterate through
            them.  Optionally, clients can install a filter.
    
            * Scripts/modules/patchcollection.py: Added.
            * Scripts/modules/patchcollection_unittest.py: Added.
            * Scripts/run-webkit-unittests:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51027 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index bf2df12..5539eb9 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -16,6 +16,18 @@
 
         Reviewed by Adam Barth.
 
+        bugzilla-tool land-patches will close bugs with patches r=?
+        https://bugs.webkit.org/show_bug.cgi?id=28230
+
+        The commit-queue shouldn't close patches with outstanding reviews on them,
+        even if many reviewers seem to be against multi-patch bugs.
+
+        * Scripts/bugzilla-tool:
+
+2009-11-16  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
         bugzilla-tool check-style should work with attachment ids instead of bug ids
         https://bugs.webkit.org/show_bug.cgi?id=31540
 
diff --git a/WebKitTools/Scripts/bugzilla-tool b/WebKitTools/Scripts/bugzilla-tool
index b366910..3392fb6 100755
--- a/WebKitTools/Scripts/bugzilla-tool
+++ b/WebKitTools/Scripts/bugzilla-tool
@@ -377,8 +377,14 @@ class LandPatchesFromBugs(Command):
 
     @classmethod
     def _close_bug_if_no_active_patches(cls, bugs, bug_id):
-        # This should check to make sure there are no r? or r+ patches on the bug before closing.
-        # https://bugs.webkit.org/show_bug.cgi?id=28230
+        # Check to make sure there are no r? or r+ patches on the bug before closing.
+        # Assume that r- patches are just previous patches someone forgot to obsolete.
+        patches = bugs.fetch_patches_from_bug(bug_id)
+        for patch in patches:
+            review_flag = patch.get('review')
+            if review_flag == '?' or review_flag == '+':
+                log("Not closing bug %s as attachment %s has review=%s.  Assuming there are more patches to land from this bug." % (patch['bug_id'], patch['id'], review_flag))
+                return
         bugs.close_bug_as_fixed(bug_id, "All reviewed patches have been landed.  Closing bug.")
 
     @classmethod

-- 
WebKit Debian packaging