[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 a13199fca2e24a3f03da69dea66006d2c52f3ac3
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 4 08:30:15 2010 +0000

    2010-01-04  Daniel Bates  <dbates at webkit.org>
    
            Reviewed by Eric Seidel.
    
            https://bugs.webkit.org/show_bug.cgi?id=33039
    
            [bzt] Second attempt to fix an issue where bugzilla-tool dies
            when the keychain lookup fails to find an entry for bugs.webkit.org.
    
            * Scripts/webkitpy/credentials.py:
            * Scripts/webkitpy/credentials_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52710 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 5825007..b1950a4 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -14,6 +14,18 @@
 
         Reviewed by Adam Barth.
 
+        Make Rollout an AbstractSequencedCommmand
+        https://bugs.webkit.org/show_bug.cgi?id=33133
+
+        As suggested by Adam in:
+        https://bugs.webkit.org/show_bug.cgi?id=33131#c2
+
+        * Scripts/webkitpy/commands/download.py:
+
+2010-01-04  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
         Make all commands AbstractDeclarativeCommmands instead of direct Command subclasses
         https://bugs.webkit.org/show_bug.cgi?id=33131
 
diff --git a/WebKitTools/Scripts/webkitpy/commands/download.py b/WebKitTools/Scripts/webkitpy/commands/download.py
index 6a402e2..55bdbf4 100644
--- a/WebKitTools/Scripts/webkitpy/commands/download.py
+++ b/WebKitTools/Scripts/webkitpy/commands/download.py
@@ -244,21 +244,18 @@ class LandPatches(AbstractPatchLandingCommand, ProcessBugsMixin):
     show_in_main_help = True
 
 
-# FIXME: Make Rollout more declarative.
-class Rollout(AbstractDeclarativeCommmand):
+class Rollout(AbstractSequencedCommmand):
     name = "rollout"
     show_in_main_help = True
     help_text = "Revert the given revision in the working copy and optionally commit the revert and re-open the original bug"
     argument_names = "REVISION [BUGID]"
-    def __init__(self):
-        self._sequence = StepSequence([
-            CleanWorkingDirectoryStep,
-            UpdateStep,
-            RevertRevisionStep,
-            PrepareChangeLogForRevertStep,
-            CompleteRollout,
-        ])
-        AbstractDeclarativeCommmand.__init__(self, self._sequence.options())
+    steps = [
+        CleanWorkingDirectoryStep,
+        UpdateStep,
+        RevertRevisionStep,
+        PrepareChangeLogForRevertStep,
+        CompleteRollout,
+    ]
 
     @staticmethod
     def _parse_bug_id_from_revision_diff(tool, revision):

-- 
WebKit Debian packaging