[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Thu Apr 8 00:41:27 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit d4f06c14cef4a5137a1c100350e458ad7b20f6d4
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 18 01:28:27 2009 +0000
2009-12-17 Eric Seidel <eric at webkit.org>
Reviewed by Adam Barth.
Command.show_in_main_help should default to False
https://bugs.webkit.org/show_bug.cgi?id=32686
* Scripts/modules/commands/download.py:
* Scripts/modules/commands/queries.py:
* Scripts/modules/commands/queues.py:
* Scripts/modules/commands/upload.py:
* Scripts/modules/multicommandtool.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52295 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c43d91f..6f5f2fa 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-17 Eric Seidel <eric at webkit.org>
+
+ Reviewed by Adam Barth.
+
+ Command.show_in_main_help should default to False
+ https://bugs.webkit.org/show_bug.cgi?id=32686
+
+ * Scripts/modules/commands/download.py:
+ * Scripts/modules/commands/queries.py:
+ * Scripts/modules/commands/queues.py:
+ * Scripts/modules/commands/upload.py:
+ * Scripts/modules/multicommandtool.py:
+
2009-12-17 Alejandro G. Castro <alex at igalia.com>
Reviewed by Eric Seidel.
diff --git a/WebKitTools/Scripts/modules/commands/download.py b/WebKitTools/Scripts/modules/commands/download.py
index cdc81c1..b8fcb18 100644
--- a/WebKitTools/Scripts/modules/commands/download.py
+++ b/WebKitTools/Scripts/modules/commands/download.py
@@ -68,8 +68,6 @@ class AbstractSequencedCommmand(AbstractDeclarativeCommmand):
class Build(AbstractSequencedCommmand):
name = "build"
help_text = "Update working copy and build"
- argument_names = ""
- show_in_main_help = False
steps = [
CleanWorkingDirectoryStep,
UpdateStep,
@@ -166,7 +164,6 @@ class CheckStyle(AbstractPatchSequencingCommand, ProcessAttachmentsMixin):
name = "check-style"
help_text = "Run check-webkit-style on the specified attachments"
argument_names = "ATTACHMENT_ID [ATTACHMENT_IDS]"
- show_in_main_help = False
main_steps = [
CleanWorkingDirectoryStep,
UpdateStep,
@@ -179,7 +176,6 @@ class BuildAttachment(AbstractPatchSequencingCommand, ProcessAttachmentsMixin):
name = "build-attachment"
help_text = "Apply and build patches from bugzilla"
argument_names = "ATTACHMENT_ID [ATTACHMENT_IDS]"
- show_in_main_help = False
main_steps = [
CleanWorkingDirectoryStep,
UpdateStep,
diff --git a/WebKitTools/Scripts/modules/commands/queries.py b/WebKitTools/Scripts/modules/commands/queries.py
index 98310e3..eaddb0d 100644
--- a/WebKitTools/Scripts/modules/commands/queries.py
+++ b/WebKitTools/Scripts/modules/commands/queries.py
@@ -39,7 +39,6 @@ from modules.multicommandtool import Command
class BugsToCommit(Command):
name = "bugs-to-commit"
- show_in_main_help = False
def __init__(self):
Command.__init__(self, "List bugs in the commit-queue")
@@ -51,7 +50,6 @@ class BugsToCommit(Command):
class PatchesToCommit(Command):
name = "patches-to-commit"
- show_in_main_help = False
def __init__(self):
Command.__init__(self, "List patches in the commit-queue")
@@ -64,7 +62,6 @@ class PatchesToCommit(Command):
class PatchesToCommitQueue(Command):
name = "patches-to-commit-queue"
- show_in_main_help = False
def __init__(self):
options = [
make_option("--bugs", action="store_true", dest="bugs", help="Output bug links instead of patch links"),
@@ -99,7 +96,6 @@ class PatchesToCommitQueue(Command):
class PatchesToReview(Command):
name = "patches-to-review"
- show_in_main_help = False
def __init__(self):
Command.__init__(self, "List patches that are pending review")
@@ -112,7 +108,6 @@ class PatchesToReview(Command):
class ReviewedPatches(Command):
name = "reviewed-patches"
- show_in_main_help = False
def __init__(self):
Command.__init__(self, "List r+'d patches on a bug", "BUGID")
diff --git a/WebKitTools/Scripts/modules/commands/queues.py b/WebKitTools/Scripts/modules/commands/queues.py
index 606636f..f8fef96 100644
--- a/WebKitTools/Scripts/modules/commands/queues.py
+++ b/WebKitTools/Scripts/modules/commands/queues.py
@@ -44,7 +44,6 @@ from modules.stepsequence import StepSequenceErrorHandler
from modules.workqueue import WorkQueue, WorkQueueDelegate
class AbstractQueue(Command, WorkQueueDelegate):
- show_in_main_help = False
watchers = "webkit-bot-watchers at googlegroups.com"
def __init__(self, options=None): # Default values should never be collections (like []) as default values are shared between invocations
options_list = (options or []) + [
diff --git a/WebKitTools/Scripts/modules/commands/upload.py b/WebKitTools/Scripts/modules/commands/upload.py
index d288301..ef8ba1e 100644
--- a/WebKitTools/Scripts/modules/commands/upload.py
+++ b/WebKitTools/Scripts/modules/commands/upload.py
@@ -44,7 +44,6 @@ from modules.multicommandtool import Command
# FIXME: Requires unit test.
class CommitMessageForCurrentDiff(Command):
name = "commit-message"
- show_in_main_help = False
def __init__(self):
Command.__init__(self, "Print a commit message suitable for the uncommitted changes")
@@ -55,7 +54,6 @@ class CommitMessageForCurrentDiff(Command):
class ObsoleteAttachments(Command):
name = "obsolete-attachments"
- show_in_main_help = False
def __init__(self):
Command.__init__(self, "Mark all attachments on a bug as obsolete", "BUGID")
diff --git a/WebKitTools/Scripts/modules/multicommandtool.py b/WebKitTools/Scripts/modules/multicommandtool.py
index 0475cf1..53384d3 100644
--- a/WebKitTools/Scripts/modules/multicommandtool.py
+++ b/WebKitTools/Scripts/modules/multicommandtool.py
@@ -40,7 +40,7 @@ from modules.logging import log
class Command(object):
name = None
- # show_in_main_help = False # Subclasses must define show_in_main_help, we leave it out here to enforce that.
+ show_in_main_help = False
def __init__(self, help_text, argument_names=None, options=None, requires_local_commits=False):
self.help_text = help_text
self.argument_names = argument_names
@@ -128,7 +128,6 @@ class HelpPrintingOptionParser(OptionParser):
class HelpCommand(Command):
name = "help"
- show_in_main_help = False
def __init__(self):
options = [
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list