Changeset 46563 in webkit

Timestamp:

Jul 29, 2009 4:48:25 PM (15 years ago)

Author:

ddkilzer@apple.com

Message:

<​http://webkit.org/b/27082> bugzilla-tool: Add --no-close switch to land-patches

Reviewed by David Levin.

• Scripts/bugzilla-tool: (LandPatchesFromBugs.init): Added --no-close switch. (LandPatchesFromBugs.land_patches): Don't close the bug if the --no-close switch was used. Always clear the review+ flag on every landed patch using the commit_text message when cleared. This prevents patches from showing up in the commit queue if reopened and provides consistency with all landed patches.
• Scripts/modules/bugzilla.py: (Bugzilla.clear_attachment_review_flag): Added.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/bugzilla-tool (modified) (2 diffs)
• Scripts/modules/bugzilla.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-07-29  David Kilzer  <ddkilzer@apple.com>
+
+        <http://webkit.org/b/27082> bugzilla-tool: Add --no-close switch to land-patches
+
+        Reviewed by David Levin.
+
+        * Scripts/bugzilla-tool:
+        (LandPatchesFromBugs.__init__): Added --no-close switch.
+        (LandPatchesFromBugs.land_patches): Don't close the bug if the
+        --no-close switch was used.  Always clear the review+ flag on
+        every landed patch using the commit_text message when cleared.
+        This prevents patches from showing up in the commit queue if
+        reopened and provides consistency with all landed patches.
+        * Scripts/modules/bugzilla.py:
+        (Bugzilla.clear_attachment_review_flag): Added.
+
 2009-07-29  David Kilzer  <ddkilzer@apple.com>
 

trunk/WebKitTools/Scripts/bugzilla-tool

@@ -270 +270 @@
             make_option("--force-clean", action="store_true", dest="force_clean", default=False, help="Clean working directory before applying patches (removes local changes and commits)"),
             make_option("--no-clean", action="store_false", dest="clean", default=True, help="Don't check if the working directory is clean before applying patches"),
+            make_option("--no-close", action="store_false", dest="close_bug", default=True, help="Leave bug open after landing."),
             make_option("--no-build", action="store_false", dest="build", default=True, help="Commit without building first, implies --no-test."),
             make_option("--no-test", action="store_false", dest="test", default=True, help="Commit without running run-webkit-tests."),
@@ -320 +321 @@
                 tool.scm().apply_patch(patch)
                 comment_text = cls.build_and_commit(tool.scm(), options)
-
-                # If we're commiting more than one patch, update the bug as we go.
-                if len(patches) > 1:
-                    tool.bugs.obsolete_attachment(patch['id'], comment_text)
-
-            if len(patches) > 1:
-                comment_text = "All reviewed patches landed, closing."
-
-            tool.bugs.close_bug_as_fixed(bug_id, comment_text)
+                tool.bugs.clear_attachment_review_flag(patch['id'], comment_text)
+
+            if options.close_bug:
+                tool.bugs.close_bug_as_fixed(bug_id, "All reviewed patches have been landed.  Closing bug.")
         except ScriptError, e:
             # We should add a comment to the bug, and r- the patch on failure

trunk/WebKitTools/Scripts/modules/bugzilla.py

@@ -351 +351 @@
         return bug_id
 
+    def clear_attachment_review_flag(self, attachment_id, additional_comment_text=None):
+        self.authenticate()
+
+        comment_text = "Clearing review flag on attachment: %s" % attachment_id
+        if additional_comment_text:
+            comment_text += "\n\n" + additional_comment_text
+        log(comment_text)
+
+        if self.dryrun:
+            return
+
+        self.browser.open(self.attachment_url_for_id(attachment_id, 'edit'))
+        self.browser.select_form(nr=1)
+        self.browser['comment'] = comment_text
+        self.browser.find_control(type='select', nr=0).value = ("X",)
+        self.browser.submit()
+
     def obsolete_attachment(self, attachment_id, comment_text = None):
         self.authenticate()