[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
eric at webkit.org
eric at webkit.org
Sun Feb 20 23:32:00 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 7a1babed011bb73a8af1edc2f73b4c2b9a74e410
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 21 11:23:39 2011 +0000
2011-01-21 Eric Seidel <eric at webkit.org>
Reviewed by Adam Barth.
Split Host object off from WebKitPatch for easier re-use
https://bugs.webkit.org/show_bug.cgi?id=52284
new-run-webkit-tests and other tools are eventually going to want one of these.
Basically you need to inherit from this class if you want to pretend to be a
self.tool object for Steps/Commands.
* Scripts/webkitpy/common/host.py: Added.
* Scripts/webkitpy/tool/main.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76339 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index b7165a1..a81fb61 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-21 Eric Seidel <eric at webkit.org>
+
+ Reviewed by Adam Barth.
+
+ Split Host object off from WebKitPatch for easier re-use
+ https://bugs.webkit.org/show_bug.cgi?id=52284
+
+ new-run-webkit-tests and other tools are eventually going to want one of these.
+ Basically you need to inherit from this class if you want to pretend to be a
+ self.tool object for Steps/Commands.
+
+ * Scripts/webkitpy/common/host.py: Added.
+ * Scripts/webkitpy/tool/main.py:
+
2011-01-20 Dirk Pranke <dpranke at chromium.org>
Reviewed by Adam Barth.
diff --git a/Tools/Scripts/webkitpy/common/host.py b/Tools/Scripts/webkitpy/common/host.py
new file mode 100644
index 0000000..8ec271e
--- /dev/null
+++ b/Tools/Scripts/webkitpy/common/host.py
@@ -0,0 +1,80 @@
+# Copyright (c) 2010 Google Inc. All rights reserved.
+# Copyright (c) 2009 Apple 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.common.checkout.api import Checkout
+from webkitpy.common.checkout.scm import default_scm
+from webkitpy.common.config.ports import WebKitPort
+from webkitpy.common.net import bugzilla, buildbot, irc, statusserver
+from webkitpy.common.system import executive, filesystem, platforminfo, user, workspace
+from webkitpy.layout_tests import port
+
+
+class Host(object):
+ def __init__(self):
+ self.bugs = bugzilla.Bugzilla()
+ self.buildbot = buildbot.BuildBot()
+ self.executive = executive.Executive()
+ self._irc = None
+ self.filesystem = filesystem.FileSystem()
+ self.workspace = workspace.Workspace(self.filesystem, self.executive)
+ self._port = None
+ self.user = user.User()
+ self._scm = None
+ self._checkout = None
+ self.status_server = statusserver.StatusServer()
+ self.port_factory = port.factory
+ self.platform = platforminfo.PlatformInfo()
+
+ def _initialize_scm(self, patch_directories=None):
+ self._scm = default_scm(patch_directories)
+ self._checkout = Checkout(self.scm())
+
+ def scm(self):
+ return self._scm
+
+ def checkout(self):
+ return self._checkout
+
+ def port(self):
+ return self._port
+
+ def ensure_irc_connected(self, irc_delegate):
+ if not self._irc:
+ self._irc = irc.ircproxy.IRCProxy(irc_delegate)
+
+ def irc(self):
+ # We don't automatically construct IRCProxy here because constructing
+ # IRCProxy actually connects to IRC. We want clients to explicitly
+ # connect to IRC.
+ return self._irc
+
+ def command_completed(self):
+ if self._irc:
+ self._irc.disconnect()
diff --git a/Tools/Scripts/webkitpy/tool/main.py b/Tools/Scripts/webkitpy/tool/main.py
index 76d5bef..6b07615 100755
--- a/Tools/Scripts/webkitpy/tool/main.py
+++ b/Tools/Scripts/webkitpy/tool/main.py
@@ -36,6 +36,7 @@ import threading
from webkitpy.common.checkout.api import Checkout
from webkitpy.common.checkout.scm import default_scm
from webkitpy.common.config.ports import WebKitPort
+from webkitpy.common.host import Host
from webkitpy.common.net.bugzilla import Bugzilla
from webkitpy.common.net.buildbot import BuildBot
from webkitpy.common.net.irc.ircproxy import IRCProxy
@@ -46,7 +47,7 @@ from webkitpy.tool.multicommandtool import MultiCommandTool
import webkitpy.tool.commands as commands
-class WebKitPatch(MultiCommandTool):
+class WebKitPatch(MultiCommandTool, Host):
global_options = [
make_option("-v", "--verbose", action="store_true", dest="verbose", default=False, help="enable all logging"),
make_option("-d", "--directory", action="append", dest="patch_directories", default=[], help="Directory to look at for changed files"),
@@ -59,58 +60,14 @@ class WebKitPatch(MultiCommandTool):
def __init__(self, path):
MultiCommandTool.__init__(self)
+ Host.__init__(self)
self._path = path
self.wakeup_event = threading.Event()
- # FIXME: All of these shared objects should move off onto a
- # separate "Tool" object. WebKitPatch should inherit from
- # "Tool" and all these objects should use getters/setters instead of
- # manual getter functions (e.g. scm()).
- self.bugs = Bugzilla()
- self.buildbot = BuildBot()
- self.executive = executive.Executive()
- self._irc = None
- self.filesystem = filesystem.FileSystem()
- self.workspace = workspace.Workspace(self.filesystem, self.executive)
- self._port = None
- self.user = user.User()
- self._scm = None
- self._checkout = None
- self.status_server = StatusServer()
- self.port_factory = port.factory
- self.platform = platforminfo.PlatformInfo()
-
- def scm(self):
- # Lazily initialize SCM to not error-out before command line parsing (or when running non-scm commands).
- if not self._scm:
- self._scm = default_scm(self._options.patch_directories)
- return self._scm
-
- def checkout(self):
- if not self._checkout:
- self._checkout = Checkout(self.scm())
- return self._checkout
-
- def port(self):
- return self._port
-
- def ensure_irc_connected(self, irc_delegate):
- if not self._irc:
- self._irc = IRCProxy(irc_delegate)
-
- def irc(self):
- # We don't automatically construct IRCProxy here because constructing
- # IRCProxy actually connects to IRC. We want clients to explicitly
- # connect to IRC.
- return self._irc
def path(self):
return self._path
- def command_completed(self):
- if self._irc:
- self._irc.disconnect()
-
def should_show_in_main_help(self, command):
if not command.show_in_main_help:
return False
@@ -120,7 +77,7 @@ class WebKitPatch(MultiCommandTool):
# FIXME: This may be unnecessary since we pass global options to all commands during execute() as well.
def handle_global_options(self, options):
- self._options = options
+ self._initialize_scm(options.patch_directories)
if options.dry_run:
self.scm().dryrun = True
self.bugs.dryrun = True
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list