[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
abarth at webkit.org
abarth at webkit.org
Thu Apr 8 00:59:40 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit fe41ad9a87533e1aae4eb9f7ccbac9479b26df0d
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 11 06:14:37 2010 +0000
2010-01-10 Adam Barth <abarth at webkit.org>
Rubber stamped by David Kilzer.
bugzilla-tool submit-patch mistakenly picks up bug URLs in non-ChangeLog files
https://bugs.webkit.org/show_bug.cgi?id=33197
Fix a typo: Commmand -> Command.
* Scripts/webkitpy/commands/abstractsequencedcommand.py:
* Scripts/webkitpy/commands/download.py:
* Scripts/webkitpy/commands/queries.py:
* Scripts/webkitpy/commands/upload.py:
* Scripts/webkitpy/multicommandtool.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53066 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 13f2b2f..8eaf455 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,20 @@
2010-01-10 Adam Barth <abarth at webkit.org>
+ Rubber stamped by David Kilzer.
+
+ bugzilla-tool submit-patch mistakenly picks up bug URLs in non-ChangeLog files
+ https://bugs.webkit.org/show_bug.cgi?id=33197
+
+ Fix a typo: Commmand -> Command.
+
+ * Scripts/webkitpy/commands/abstractsequencedcommand.py:
+ * Scripts/webkitpy/commands/download.py:
+ * Scripts/webkitpy/commands/queries.py:
+ * Scripts/webkitpy/commands/upload.py:
+ * Scripts/webkitpy/multicommandtool.py:
+
+2010-01-10 Adam Barth <abarth at webkit.org>
+
Reviewed by Darin Adler.
Let webkit-patch work with options in $EDITOR
diff --git a/WebKitTools/Scripts/webkitpy/commands/abstractsequencedcommand.py b/WebKitTools/Scripts/webkitpy/commands/abstractsequencedcommand.py
index 59f029b..53af5b1 100644
--- a/WebKitTools/Scripts/webkitpy/commands/abstractsequencedcommand.py
+++ b/WebKitTools/Scripts/webkitpy/commands/abstractsequencedcommand.py
@@ -26,15 +26,15 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-from webkitpy.multicommandtool import AbstractDeclarativeCommmand
+from webkitpy.multicommandtool import AbstractDeclarativeCommand
from webkitpy.stepsequence import StepSequence
-class AbstractSequencedCommmand(AbstractDeclarativeCommmand):
+class AbstractSequencedCommand(AbstractDeclarativeCommand):
steps = None
def __init__(self):
self._sequence = StepSequence(self.steps)
- AbstractDeclarativeCommmand.__init__(self, self._sequence.options())
+ AbstractDeclarativeCommand.__init__(self, self._sequence.options())
def _prepare_state(self, options, args, tool):
return None
diff --git a/WebKitTools/Scripts/webkitpy/commands/download.py b/WebKitTools/Scripts/webkitpy/commands/download.py
index 3f69af4..bb8c01a 100644
--- a/WebKitTools/Scripts/webkitpy/commands/download.py
+++ b/WebKitTools/Scripts/webkitpy/commands/download.py
@@ -36,16 +36,16 @@ import webkitpy.steps as steps
from webkitpy.bugzilla import parse_bug_id
# We could instead use from modules import buildsteps and then prefix every buildstep with "buildsteps."
from webkitpy.changelogs import ChangeLog
-from webkitpy.commands.abstractsequencedcommand import AbstractSequencedCommmand
+from webkitpy.commands.abstractsequencedcommand import AbstractSequencedCommand
from webkitpy.comments import bug_comment_from_commit_text
from webkitpy.executive import ScriptError
from webkitpy.grammar import pluralize
from webkitpy.webkit_logging import error, log
-from webkitpy.multicommandtool import AbstractDeclarativeCommmand
+from webkitpy.multicommandtool import AbstractDeclarativeCommand
from webkitpy.stepsequence import StepSequence
-class Build(AbstractSequencedCommmand):
+class Build(AbstractSequencedCommand):
name = "build"
help_text = "Update working copy and build"
steps = [
@@ -55,7 +55,7 @@ class Build(AbstractSequencedCommmand):
]
-class BuildAndTest(AbstractSequencedCommmand):
+class BuildAndTest(AbstractSequencedCommand):
name = "build-and-test"
help_text = "Update working copy, build, and run the tests"
steps = [
@@ -66,7 +66,7 @@ class BuildAndTest(AbstractSequencedCommmand):
]
-class Land(AbstractSequencedCommmand):
+class Land(AbstractSequencedCommand):
name = "land"
help_text = "Land the current working directory diff and updates the associated bug if any"
argument_names = "[BUGID]"
@@ -93,7 +93,7 @@ If a bug id is provided, or one can be found in the ChangeLog land will update t
}
-class AbstractPatchProcessingCommand(AbstractDeclarativeCommmand):
+class AbstractPatchProcessingCommand(AbstractDeclarativeCommand):
# Subclasses must implement the methods below. We don't declare them here
# because we want to be able to implement them with mix-ins.
#
@@ -244,7 +244,7 @@ class LandFromBug(AbstractPatchLandingCommand, ProcessBugsMixin):
show_in_main_help = True
-class Rollout(AbstractSequencedCommmand):
+class Rollout(AbstractSequencedCommand):
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"
diff --git a/WebKitTools/Scripts/webkitpy/commands/queries.py b/WebKitTools/Scripts/webkitpy/commands/queries.py
index a5c5472..18108a0 100644
--- a/WebKitTools/Scripts/webkitpy/commands/queries.py
+++ b/WebKitTools/Scripts/webkitpy/commands/queries.py
@@ -34,10 +34,10 @@ from optparse import make_option
from webkitpy.buildbot import BuildBot
from webkitpy.committers import CommitterList
from webkitpy.webkit_logging import log
-from webkitpy.multicommandtool import AbstractDeclarativeCommmand
+from webkitpy.multicommandtool import AbstractDeclarativeCommand
-class BugsToCommit(AbstractDeclarativeCommmand):
+class BugsToCommit(AbstractDeclarativeCommand):
name = "bugs-to-commit"
help_text = "List bugs in the commit-queue"
@@ -47,7 +47,7 @@ class BugsToCommit(AbstractDeclarativeCommmand):
print "%s" % bug_id
-class PatchesToCommit(AbstractDeclarativeCommmand):
+class PatchesToCommit(AbstractDeclarativeCommand):
name = "patches-to-commit"
help_text = "List patches in the commit-queue"
@@ -58,14 +58,14 @@ class PatchesToCommit(AbstractDeclarativeCommmand):
print "%s" % patch["url"]
-class PatchesToCommitQueue(AbstractDeclarativeCommmand):
+class PatchesToCommitQueue(AbstractDeclarativeCommand):
name = "patches-to-commit-queue"
help_text = "Patches which should be added to the commit queue"
def __init__(self):
options = [
make_option("--bugs", action="store_true", dest="bugs", help="Output bug links instead of patch links"),
]
- AbstractDeclarativeCommmand.__init__(self, options=options)
+ AbstractDeclarativeCommand.__init__(self, options=options)
@staticmethod
def _needs_commit_queue(patch):
@@ -93,7 +93,7 @@ class PatchesToCommitQueue(AbstractDeclarativeCommmand):
print "%s" % tool.bugs.attachment_url_for_id(patch["id"], action="edit")
-class PatchesToReview(AbstractDeclarativeCommmand):
+class PatchesToReview(AbstractDeclarativeCommand):
name = "patches-to-review"
help_text = "List patches that are pending review"
@@ -104,7 +104,7 @@ class PatchesToReview(AbstractDeclarativeCommmand):
print patch_id
-class ReviewedPatches(AbstractDeclarativeCommmand):
+class ReviewedPatches(AbstractDeclarativeCommand):
name = "reviewed-patches"
help_text = "List r+'d patches on a bug"
argument_names = "BUGID"
@@ -116,7 +116,7 @@ class ReviewedPatches(AbstractDeclarativeCommmand):
print "%s" % patch["url"]
-class TreeStatus(AbstractDeclarativeCommmand):
+class TreeStatus(AbstractDeclarativeCommand):
name = "tree-status"
help_text = "Print the status of the %s buildbots" % BuildBot.default_host
long_help = """Fetches build status from http://build.webkit.org/one_box_per_builder
diff --git a/WebKitTools/Scripts/webkitpy/commands/upload.py b/WebKitTools/Scripts/webkitpy/commands/upload.py
index 524b00e..65f6b39 100644
--- a/WebKitTools/Scripts/webkitpy/commands/upload.py
+++ b/WebKitTools/Scripts/webkitpy/commands/upload.py
@@ -38,15 +38,15 @@ from optparse import make_option
import webkitpy.steps as steps
from webkitpy.bugzilla import parse_bug_id
-from webkitpy.commands.abstractsequencedcommand import AbstractSequencedCommmand
+from webkitpy.commands.abstractsequencedcommand import AbstractSequencedCommand
from webkitpy.comments import bug_comment_from_svn_revision
from webkitpy.committers import CommitterList
from webkitpy.grammar import pluralize
from webkitpy.webkit_logging import error, log
from webkitpy.mock import Mock
-from webkitpy.multicommandtool import AbstractDeclarativeCommmand
+from webkitpy.multicommandtool import AbstractDeclarativeCommand
-class CommitMessageForCurrentDiff(AbstractDeclarativeCommmand):
+class CommitMessageForCurrentDiff(AbstractDeclarativeCommand):
name = "commit-message"
help_text = "Print a commit message suitable for the uncommitted changes"
@@ -55,7 +55,7 @@ class CommitMessageForCurrentDiff(AbstractDeclarativeCommmand):
print "%s" % tool.scm().commit_message_for_this_commit().message()
-class AssignToCommitter(AbstractDeclarativeCommmand):
+class AssignToCommitter(AbstractDeclarativeCommand):
name = "assign-to-committer"
help_text = "Assign bug to whoever attached the most recent r+'d patch"
@@ -87,7 +87,7 @@ class AssignToCommitter(AbstractDeclarativeCommmand):
self._assign_bug_to_last_patch_attacher(bug_id)
-class ObsoleteAttachments(AbstractSequencedCommmand):
+class ObsoleteAttachments(AbstractSequencedCommand):
name = "obsolete-attachments"
help_text = "Mark all attachments on a bug as obsolete"
argument_names = "BUGID"
@@ -99,7 +99,7 @@ class ObsoleteAttachments(AbstractSequencedCommmand):
return { "bug_id" : args[0] }
-class AbstractPatchUploadingCommand(AbstractSequencedCommmand):
+class AbstractPatchUploadingCommand(AbstractSequencedCommand):
def _bug_id(self, args, tool, state):
# Perfer a bug id passed as an argument over a bug url in the diff (i.e. ChangeLogs).
bug_id = args and args[0]
@@ -129,7 +129,7 @@ class Post(AbstractPatchUploadingCommand):
return state
-class Prepare(AbstractSequencedCommmand):
+class Prepare(AbstractSequencedCommand):
name = "prepare"
help_text = "Creates a bug (or prompts for an existing bug) and prepares the ChangeLogs"
argument_names = "[BUGID]"
@@ -174,7 +174,7 @@ class Upload(AbstractPatchUploadingCommand):
return state
-class EditChangeLogs(AbstractSequencedCommmand):
+class EditChangeLogs(AbstractSequencedCommand):
name = "edit-changelogs"
help_text = "Opens modified ChangeLogs in $EDITOR"
show_in_main_help = True
@@ -183,7 +183,7 @@ class EditChangeLogs(AbstractSequencedCommmand):
]
-class PostCommits(AbstractDeclarativeCommmand):
+class PostCommits(AbstractDeclarativeCommand):
name = "post-commits"
help_text = "Attach a range of local commits to bugs as patch files"
argument_names = "COMMITISH"
@@ -197,7 +197,7 @@ class PostCommits(AbstractDeclarativeCommmand):
steps.Options.review,
steps.Options.request_commit,
]
- AbstractDeclarativeCommmand.__init__(self, options=options, requires_local_commits=True)
+ AbstractDeclarativeCommand.__init__(self, options=options, requires_local_commits=True)
def _comment_text_for_commit(self, options, commit_message, tool, commit_id):
comment_text = None
@@ -237,7 +237,7 @@ class PostCommits(AbstractDeclarativeCommmand):
tool.bugs.add_patch_to_bug(bug_id, diff_file, description, comment_text, mark_for_review=options.review, mark_for_commit_queue=options.request_commit)
-class MarkBugFixed(AbstractDeclarativeCommmand):
+class MarkBugFixed(AbstractDeclarativeCommand):
name = "mark-bug-fixed"
help_text = "Mark the specified bug as fixed"
argument_names = "[SVN_REVISION]"
@@ -248,7 +248,7 @@ class MarkBugFixed(AbstractDeclarativeCommmand):
make_option("--open", action="store_true", default=False, dest="open_bug", help="Open bug in default web browser (Mac only)."),
make_option("--update-only", action="store_true", default=False, dest="update_only", help="Add comment to the bug, but do not close it."),
]
- AbstractDeclarativeCommmand.__init__(self, options=options)
+ AbstractDeclarativeCommand.__init__(self, options=options)
def _fetch_commit_log(self, tool, svn_revision):
if not svn_revision:
@@ -315,7 +315,7 @@ class MarkBugFixed(AbstractDeclarativeCommmand):
# FIXME: Requires unit test. Blocking issue: too complex for now.
-class CreateBug(AbstractDeclarativeCommmand):
+class CreateBug(AbstractDeclarativeCommand):
name = "create-bug"
help_text = "Create a bug from local changes or local commits"
argument_names = "[COMMITISH]"
@@ -328,7 +328,7 @@ class CreateBug(AbstractDeclarativeCommmand):
make_option("--no-review", action="store_false", dest="review", default=True, help="Do not mark the patch for review."),
make_option("--request-commit", action="store_true", dest="request_commit", default=False, help="Mark the patch as needing auto-commit after review."),
]
- AbstractDeclarativeCommmand.__init__(self, options=options)
+ AbstractDeclarativeCommand.__init__(self, options=options)
def create_bug_from_commit(self, options, args, tool):
commit_ids = tool.scm().commit_ids_from_commitish_arguments(args)
diff --git a/WebKitTools/Scripts/webkitpy/multicommandtool.py b/WebKitTools/Scripts/webkitpy/multicommandtool.py
index a25b150..10cf426 100644
--- a/WebKitTools/Scripts/webkitpy/multicommandtool.py
+++ b/WebKitTools/Scripts/webkitpy/multicommandtool.py
@@ -131,7 +131,7 @@ class Command(object):
# FIXME: This should just be rolled into Command. help_text and argument_names do not need to be instance variables.
-class AbstractDeclarativeCommmand(Command):
+class AbstractDeclarativeCommand(Command):
help_text = None
argument_names = None
long_help = None
@@ -159,7 +159,7 @@ class HelpPrintingOptionParser(OptionParser):
return ""
-class HelpCommand(AbstractDeclarativeCommmand):
+class HelpCommand(AbstractDeclarativeCommand):
name = "help"
help_text = "Display information about this program or its subcommands"
argument_names = "[COMMAND]"
@@ -168,7 +168,7 @@ class HelpCommand(AbstractDeclarativeCommmand):
options = [
make_option("-a", "--all-commands", action="store_true", dest="show_all_commands", help="Print all available commands"),
]
- AbstractDeclarativeCommmand.__init__(self, options)
+ AbstractDeclarativeCommand.__init__(self, options)
self.show_all_commands = False # A hack used to pass --all-commands to _help_epilog even though it's called by the OptionParser.
def _help_epilog(self):
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list