[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 7d2ba3b1d1ae9a2de3d0fdb83bc1f31df32dee61
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 10 08:33:26 2009 +0000

    2009-12-10  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            [bzt] Convert more commands to StepSequences
            https://bugs.webkit.org/show_bug.cgi?id=32362
    
            We should eventually convert all the commands, but I'm starting with
            the easy ones.
    
            * Scripts/modules/commands/download.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51942 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 39f9c99..9583f57 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-10  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        [bzt] Convert more commands to StepSequences
+        https://bugs.webkit.org/show_bug.cgi?id=32362
+
+        We should eventually convert all the commands, but I'm starting with
+        the easy ones.
+
+        * Scripts/modules/commands/download.py:
+
 2009-12-10  Xan Lopez  <xlopez at igalia.com>
 
         Reviewed by Jan Alonzo.
diff --git a/WebKitTools/Scripts/modules/commands/download.py b/WebKitTools/Scripts/modules/commands/download.py
index 559c0ce..2acd69f 100644
--- a/WebKitTools/Scripts/modules/commands/download.py
+++ b/WebKitTools/Scripts/modules/commands/download.py
@@ -33,7 +33,7 @@ import os
 from optparse import make_option
 
 from modules.bugzilla import parse_bug_id
-from modules.buildsteps import CommandOptions, BuildSteps, EnsureBuildersAreGreenStep, CleanWorkingDirectoryStep, UpdateStep, BuildStep, CheckStyleStep, PrepareChangelogStep
+from modules.buildsteps import CommandOptions, BuildSteps, EnsureBuildersAreGreenStep, CleanWorkingDirectoryStep, UpdateStep, ApplyPatchStep, BuildStep, CheckStyleStep, PrepareChangelogStep
 from modules.changelogs import ChangeLog
 from modules.comments import bug_comment_from_commit_text
 from modules.executive import ScriptError
@@ -224,27 +224,17 @@ class AbstractPatchProcessingCommand(Command):
             self._process_patch(patch, options, args, tool)
 
 
-class CheckStyleSequence(LandingSequence):
-    def run(self):
-        self.clean()
-        self.update()
-        self.apply_patch()
-        self.build()
-
-    def build(self):
-        # Instead of building, we check style.
-        step = CheckStyleStep(self._tool, self._options)
-        step.run()
-
-
 class CheckStyle(AbstractPatchProcessingCommand):
     name = "check-style"
     show_in_main_help = False
     def __init__(self):
-        options = BuildSteps.cleaning_options()
-        options += BuildSteps.build_options()
-        options += BuildSteps.land_options()
-        AbstractPatchProcessingCommand.__init__(self, "Run check-webkit-style on the specified attachments", "ATTACHMENT_ID [ATTACHMENT_IDS]", options)
+        self._sequence = StepSequence([
+            CleanWorkingDirectoryStep,
+            UpdateStep,
+            ApplyPatchStep,
+            CheckStyleStep,
+        ])
+        AbstractPatchProcessingCommand.__init__(self, "Run check-webkit-style on the specified attachments", "ATTACHMENT_ID [ATTACHMENT_IDS]", self._sequence.options())
 
     def _fetch_list_of_patches_to_process(self, options, args, tool):
         return map(lambda patch_id: tool.bugs.fetch_attachment(patch_id), args)
@@ -253,26 +243,20 @@ class CheckStyle(AbstractPatchProcessingCommand):
         pass
 
     def _process_patch(self, patch, options, args, tool):
-        sequence = CheckStyleSequence(patch, options, tool)
-        sequence.run_and_handle_errors()
-
-
-class BuildAttachmentSequence(LandingSequence):
-    def run(self):
-        self.clean()
-        self.update()
-        self.apply_patch()
-        self.build()
+        self._sequence.run_and_handle_errors(tool, options, patch)
 
 
 class BuildAttachment(AbstractPatchProcessingCommand):
     name = "build-attachment"
     show_in_main_help = False
     def __init__(self):
-        options = BuildSteps.cleaning_options()
-        options += BuildSteps.build_options()
-        options += BuildSteps.land_options()
-        AbstractPatchProcessingCommand.__init__(self, "Apply and build patches from bugzilla", "ATTACHMENT_ID [ATTACHMENT_IDS]", options)
+        self._sequence = StepSequence([
+            CleanWorkingDirectoryStep,
+            UpdateStep,
+            ApplyPatchStep,
+            BuildStep,
+        ])
+        AbstractPatchProcessingCommand.__init__(self, "Apply and build patches from bugzilla", "ATTACHMENT_ID [ATTACHMENT_IDS]", self._sequence.options())
 
     def _fetch_list_of_patches_to_process(self, options, args, tool):
         return map(lambda patch_id: tool.bugs.fetch_attachment(patch_id), args)
@@ -281,8 +265,7 @@ class BuildAttachment(AbstractPatchProcessingCommand):
         pass
 
     def _process_patch(self, patch, options, args, tool):
-        sequence = BuildAttachmentSequence(patch, options, tool)
-        sequence.run_and_handle_errors()
+        self._sequence.run_and_handle_errors(tool, options, patch)
 
 
 class AbstractPatchLandingCommand(AbstractPatchProcessingCommand):

-- 
WebKit Debian packaging