Changeset 51232 in webkit

Timestamp:

Nov 19, 2009 11:01:26 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-11-19 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Abstract AbstractPatchProcessingCommand from AbstractPatchLandingCommand
​https://bugs.webkit.org/show_bug.cgi?id=31707

This is to help when we implement build-attachment.

• Scripts/bugzilla-tool:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/bugzilla-tool (modified) (4 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-11-19  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Abstract AbstractPatchProcessingCommand from AbstractPatchLandingCommand
+        https://bugs.webkit.org/show_bug.cgi?id=31707
+
+        This is to help when we implement build-attachment.
+
+        * Scripts/bugzilla-tool:
+
 2009-11-19  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/bugzilla-tool

@@ -387 +387 @@
 
 
-class AbstractPatchLandingCommand(Command):
-    def __init__(self, description, args_description):
-        options = WebKitLandingScripts.cleaning_options() + WebKitLandingScripts.land_options()
+class AbstractPatchProcessingCommand(Command):
+    def __init__(self, description, args_description, options):
         Command.__init__(self, description, args_description, options=options)
 
-    @staticmethod
-    def _fetch_list_of_patches_to_land(options, args, tool):
+    def _fetch_list_of_patches_to_process(self, options, args, tool):
+        raise NotImplementedError, "subclasses must implement"
+
+    def _prepare_to_process(self, options, args, tool):
         raise NotImplementedError, "subclasses must implement"
 
@@ -408 +409 @@
             error("%s required" % self.argument_names)
 
+        self._prepare_to_process(options, args, tool)
+        patches = self._fetch_list_of_patches_to_process(options, args, tool)
+
+        # It's nice to print out total statistics.
+        bugs_to_patches = self._collect_patches_by_bug(patches)
+        log("Processing %s from %s." % (pluralize("patch", len(patches)), pluralize("bug", len(bugs_to_patches))))
+
+        for patch in patches:
+            self._process_patch(patch, options, args, tool)
+
+
+class AbstractPatchLandingCommand(AbstractPatchProcessingCommand):
+    def __init__(self, description, args_description):
+        options = WebKitLandingScripts.cleaning_options() + WebKitLandingScripts.land_options()
+        AbstractPatchProcessingCommand.__init__(self, description, args_description, options)
+
+    def _prepare_to_process(self, options, args, tool):
         # Check the tree status first so we can fail early.
         WebKitLandingScripts.ensure_builders_are_green(tool.buildbot, options)
         WebKitLandingScripts.prepare_clean_working_directory(tool.scm(), options)
 
-        patches = self._fetch_list_of_patches_to_land(options, args, tool)
-
-        # It's nice to print out total statistics.
-        bugs_to_patches = self._collect_patches_by_bug(patches)
-        log("Landing %s from %s." % (pluralize("patch", len(patches)), pluralize("bug", len(bugs_to_patches))))
-
-        for patch in patches:
-            WebKitLandingScripts.land_patch_and_handle_errors(patch, options, tool)
+    def _process_patch(self, patch, options, args, tool):
+        WebKitLandingScripts.land_patch_and_handle_errors(patch, options, tool)
 
 
@@ -426 +438 @@
         AbstractPatchLandingCommand.__init__(self, "Lands a patches from bugzilla, optionally building and testing them first", "ATTACHMENT_ID [ATTACHMENT_IDS]")
 
-    @staticmethod
-    def _fetch_list_of_patches_to_land(options, args, tool):
+    def _fetch_list_of_patches_to_process(self, options, args, tool):
         return map(lambda patch_id: tool.bugs.fetch_attachment(patch_id), args)
 
@@ -435 +446 @@
         AbstractPatchLandingCommand.__init__(self, "Lands all patches on the given bugs, optionally building and testing them first", "BUGID [BUGIDS]")
 
-    @staticmethod
-    def _fetch_list_of_patches_to_land(options, args, tool):
+    def _fetch_list_of_patches_to_process(self, options, args, tool):
         all_patches = []
         for bug_id in args: