[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:53:11 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit ea477f59ffc5aa79d52402684a093d985730af57
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 4 09:33:43 2010 +0000
2010-01-04 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
[bzt] Move AbstractSequencedCommand to a more general location
https://bugs.webkit.org/show_bug.cgi?id=33137
I do what the FIXME tell me to do.
* Scripts/webkitpy/commands/abstractsequencedcommand.py: Added.
* Scripts/webkitpy/commands/download.py:
* Scripts/webkitpy/commands/upload.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52717 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 6cf7796..65aa34a 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,19 @@
Reviewed by Eric Seidel.
+ [bzt] Move AbstractSequencedCommand to a more general location
+ https://bugs.webkit.org/show_bug.cgi?id=33137
+
+ I do what the FIXME tell me to do.
+
+ * Scripts/webkitpy/commands/abstractsequencedcommand.py: Added.
+ * Scripts/webkitpy/commands/download.py:
+ * Scripts/webkitpy/commands/upload.py:
+
+2010-01-04 Adam Barth <abarth at webkit.org>
+
+ Reviewed by Eric Seidel.
+
Rename StatusBot to StatusServer
https://bugs.webkit.org/show_bug.cgi?id=33139
diff --git a/WebKitTools/Scripts/webkitpy/commands/abstractsequencedcommand.py b/WebKitTools/Scripts/webkitpy/commands/abstractsequencedcommand.py
new file mode 100644
index 0000000..59f029b
--- /dev/null
+++ b/WebKitTools/Scripts/webkitpy/commands/abstractsequencedcommand.py
@@ -0,0 +1,43 @@
+# Copyright (C) 2010 Google Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (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.stepsequence import StepSequence
+
+
+class AbstractSequencedCommmand(AbstractDeclarativeCommmand):
+ steps = None
+ def __init__(self):
+ self._sequence = StepSequence(self.steps)
+ AbstractDeclarativeCommmand.__init__(self, self._sequence.options())
+
+ def _prepare_state(self, options, args, tool):
+ return None
+
+ def execute(self, options, args, tool):
+ self._sequence.run_and_handle_errors(tool, options, self._prepare_state(options, args, tool))
diff --git a/WebKitTools/Scripts/webkitpy/commands/download.py b/WebKitTools/Scripts/webkitpy/commands/download.py
index 3e1bb4e..13e00fc 100644
--- a/WebKitTools/Scripts/webkitpy/commands/download.py
+++ b/WebKitTools/Scripts/webkitpy/commands/download.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# Copyright (c) 2009, Google Inc. All rights reserved.
# Copyright (c) 2009 Apple Inc. All rights reserved.
#
@@ -37,6 +36,7 @@ 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.comments import bug_comment_from_commit_text
from webkitpy.executive import ScriptError
from webkitpy.grammar import pluralize
@@ -45,20 +45,6 @@ from webkitpy.multicommandtool import AbstractDeclarativeCommmand
from webkitpy.stepsequence import StepSequence
-# FIXME: Move this to a more general location.
-class AbstractSequencedCommmand(AbstractDeclarativeCommmand):
- steps = None
- def __init__(self):
- self._sequence = StepSequence(self.steps)
- AbstractDeclarativeCommmand.__init__(self, self._sequence.options())
-
- def _prepare_state(self, options, args, tool):
- return None
-
- def execute(self, options, args, tool):
- self._sequence.run_and_handle_errors(tool, options, self._prepare_state(options, args, tool))
-
-
class Build(AbstractSequencedCommmand):
name = "build"
help_text = "Update working copy and build"
diff --git a/WebKitTools/Scripts/webkitpy/commands/upload.py b/WebKitTools/Scripts/webkitpy/commands/upload.py
index 165f2ef..3afb1e2 100644
--- a/WebKitTools/Scripts/webkitpy/commands/upload.py
+++ b/WebKitTools/Scripts/webkitpy/commands/upload.py
@@ -38,7 +38,7 @@ from optparse import make_option
import webkitpy.steps as steps
from webkitpy.bugzilla import parse_bug_id
-from webkitpy.commands.download import AbstractSequencedCommmand
+from webkitpy.commands.abstractsequencedcommand import AbstractSequencedCommmand
from webkitpy.comments import bug_comment_from_svn_revision
from webkitpy.committers import CommitterList
from webkitpy.grammar import pluralize
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list