[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 e9423fdd888e48b443b05b42f38f7de9c7df524f
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 20 19:06:02 2009 +0000

    2009-11-20  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Make commit-queue and style-queue show up in help
            https://bugs.webkit.org/show_bug.cgi?id=31724
    
            We need to store their names on their class to make these commands
            properly register themselves with MultiCommandTool.
    
            * Scripts/bugzilla-tool:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51244 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ac1e16e..bf7e513 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,18 @@
 
         Reviewed by Eric Seidel.
 
+        Make commit-queue and style-queue show up in help
+        https://bugs.webkit.org/show_bug.cgi?id=31724
+
+        We need to store their names on their class to make these commands
+        properly register themselves with MultiCommandTool.
+
+        * Scripts/bugzilla-tool:
+
+2009-11-20  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
         Implement bugzilla-tool build-attachment
         https://bugs.webkit.org/show_bug.cgi?id=31722
 
diff --git a/WebKitTools/Scripts/bugzilla-tool b/WebKitTools/Scripts/bugzilla-tool
index 922595a..6d8bfef 100755
--- a/WebKitTools/Scripts/bugzilla-tool
+++ b/WebKitTools/Scripts/bugzilla-tool
@@ -632,30 +632,29 @@ class TreeStatus(Command):
 
 
 class AbstractQueue(Command, WorkQueueDelegate):
-    def __init__(self, name):
-        self._name = name
+    def __init__(self):
         options = [
             make_option("--no-confirm", action="store_false", dest="confirm", default=True, help="Do not ask the user for confirmation before running the queue.  Dangerous!"),
             make_option("--status-host", action="store", type="string", dest="status_host", default=StatusBot.default_host, help="Hostname (e.g. localhost or commit.webkit.org) where status updates should be posted."),
         ]
-        Command.__init__(self, "Run the %s." % self._name, options=options)
+        Command.__init__(self, "Run the %s." % self.name, options=options)
 
     def queue_log_path(self):
-        return "%s.log" % self._name
+        return "%s.log" % self.name
 
     def work_logs_directory(self):
-        return "%s-logs" % self._name
+        return "%s-logs" % self.name
 
     def status_host(self):
         return self.options.status_host
 
     def begin_work_queue(self):
-        log("CAUTION: %s will discard all local changes in %s" % (self._name, self.tool.scm().checkout_root))
+        log("CAUTION: %s will discard all local changes in %s" % (self.name, self.tool.scm().checkout_root))
         if self.options.confirm:
             response = raw_input("Are you sure?  Type \"yes\" to continue: ")
             if (response != "yes"):
                 error("User declined.")
-        log("Running WebKit %s. %s" % (self._name, datetime.now().strftime(WorkQueue.log_date_format)))
+        log("Running WebKit %s. %s" % (self.name, datetime.now().strftime(WorkQueue.log_date_format)))
 
     def should_continue_work_queue(self):
         return True
@@ -679,7 +678,7 @@ class AbstractQueue(Command, WorkQueueDelegate):
         WebKitLandingScripts.run_and_throw_if_fail(bugzilla_tool_args)
 
     def log_progress(self, patch_ids):
-        log("%s in %s [%s]" % (pluralize("patch", len(patch_ids)), self._name, ", ".join(patch_ids)))
+        log("%s in %s [%s]" % (pluralize("patch", len(patch_ids)), self.name, ", ".join(patch_ids)))
 
     def execute(self, options, args, tool):
         self.options = options
@@ -689,8 +688,9 @@ class AbstractQueue(Command, WorkQueueDelegate):
 
 
 class CommitQueue(AbstractQueue):
+    name = "commit-queue"
     def __init__(self):
-        AbstractQueue.__init__(self, "commit-queue")
+        AbstractQueue.__init__(self)
 
     def begin_work_queue(self):
         AbstractQueue.begin_work_queue(self)
@@ -718,8 +718,9 @@ class CommitQueue(AbstractQueue):
 
 
 class StyleQueue(AbstractQueue):
+    name = "style-queue"
     def __init__(self):
-        AbstractQueue.__init__(self, "style-queue")
+        AbstractQueue.__init__(self)
 
     def status_host(self):
         return None # FIXME: A hack until we come up with a more generic status page.

-- 
WebKit Debian packaging