[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87

[abarth at webkit.org]

The following commit has been merged in the debian/unstable branch:
commit 838d178dad95bda3256b5541c952820e741fedb9
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 12 09:50:12 2010 +0000

    2010-01-12  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Remove copy/paste code from subclasses of AbstractReviewQueue
            https://bugs.webkit.org/show_bug.cgi?id=33525
    
            * Scripts/webkitpy/commands/early_warning_system.py:
            * Scripts/webkitpy/commands/queues.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53123 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 502b5a9..d6f18ae 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Eric Seidel.
 
+        Remove copy/paste code from subclasses of AbstractReviewQueue
+        https://bugs.webkit.org/show_bug.cgi?id=33525
+
+        * Scripts/webkitpy/commands/early_warning_system.py:
+        * Scripts/webkitpy/commands/queues.py:
+
+2010-01-12  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
         Add Gustavo and Xan as gtk-ews watchers
         https://bugs.webkit.org/show_bug.cgi?id=33519
 
diff --git a/WebKitTools/Scripts/webkitpy/commands/early_warning_system.py b/WebKitTools/Scripts/webkitpy/commands/early_warning_system.py
index 026b577..eb22533 100644
--- a/WebKitTools/Scripts/webkitpy/commands/early_warning_system.py
+++ b/WebKitTools/Scripts/webkitpy/commands/early_warning_system.py
@@ -49,21 +49,16 @@ class AbstractEarlyWarningSystem(AbstractReviewQueue):
             return False
         return True
 
-    def process_work_item(self, patch):
-        try:
-            self.run_webkit_patch([
-                "build-attachment",
-                self.port.flag(),
-                "--force-clean",
-                "--quiet",
-                "--non-interactive",
-                "--parent-command=%s" % self.name,
-                "--no-update",
-                patch["id"]])
-            self._did_pass(patch)
-        except ScriptError, e:
-            self._did_fail(patch)
-            raise e
+    def _review_patch(self, patch):
+        self.run_webkit_patch([
+            "build-attachment",
+            self.port.flag(),
+            "--force-clean",
+            "--quiet",
+            "--non-interactive",
+            "--parent-command=%s" % self.name,
+            "--no-update",
+            patch["id"]])
 
     @classmethod
     def handle_script_error(cls, tool, state, script_error):
diff --git a/WebKitTools/Scripts/webkitpy/commands/queues.py b/WebKitTools/Scripts/webkitpy/commands/queues.py
index 64c13c9..c2bdd36 100644
--- a/WebKitTools/Scripts/webkitpy/commands/queues.py
+++ b/WebKitTools/Scripts/webkitpy/commands/queues.py
@@ -207,6 +207,9 @@ class AbstractReviewQueue(AbstractQueue, PersistentPatchCollectionDelegate, Step
     def __init__(self, options=None):
         AbstractQueue.__init__(self, options)
 
+    def _review_patch(self, patch):
+        raise NotImplementedError, "subclasses must implement"
+
     # PersistentPatchCollectionDelegate methods
 
     def collection_name(self):
@@ -234,7 +237,12 @@ class AbstractReviewQueue(AbstractQueue, PersistentPatchCollectionDelegate, Step
         raise NotImplementedError, "subclasses must implement"
 
     def process_work_item(self, patch):
-        raise NotImplementedError, "subclasses must implement"
+        try:
+            self._review_patch(patch)
+            self._did_pass(patch)
+        except ScriptError, e:
+            self._did_fail(patch)
+            raise e
 
     def handle_unexpected_error(self, patch, message):
         log(message)
@@ -255,13 +263,8 @@ class StyleQueue(AbstractReviewQueue):
         self._update_status("Checking style", patch)
         return True
 
-    def process_work_item(self, patch):
-        try:
-            self.run_webkit_patch(["check-style", "--force-clean", "--non-interactive", "--parent-command=style-queue", patch["id"]])
-            self._did_pass(patch)
-        except ScriptError, e:
-            self._did_fail(patch)
-            raise e
+    def _review_patch(self, patch):
+        self.run_webkit_patch(["check-style", "--force-clean", "--non-interactive", "--parent-command=style-queue", patch["id"]])
 
     @classmethod
     def handle_script_error(cls, tool, state, script_error):

-- 
WebKit Debian packaging