Changeset 85452 in webkit

Timestamp:

May 1, 2011 6:46:45 PM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-05-01 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Move checkout/api.py to checkout/checkout.py
​https://bugs.webkit.org/show_bug.cgi?id=59906

This is more consistent with Python style.

• Scripts/webkitpy/common/checkout/init.py:
• Scripts/webkitpy/common/checkout/scm_unittest.py:
• Scripts/webkitpy/common/host.py:
• Scripts/webkitpy/tool/main.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/checkout/__init__.py (modified) (1 diff)
• Scripts/webkitpy/common/checkout/checkout.py (moved) (moved from trunk/Tools/Scripts/webkitpy/common/checkout/api.py)
• Scripts/webkitpy/common/checkout/checkout_unittest.py (moved) (moved from trunk/Tools/Scripts/webkitpy/common/checkout/api_unittest.py) (1 diff)
• Scripts/webkitpy/common/checkout/scm/scm_unittest.py (modified) (1 diff)
• Scripts/webkitpy/common/checkout/scm/svn.py (modified) (2 diffs)
• Scripts/webkitpy/common/host.py (modified) (1 diff)
• Scripts/webkitpy/tool/main.py (modified) (1 diff)
• TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-01  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Move checkout/api.py to checkout/checkout.py
+        https://bugs.webkit.org/show_bug.cgi?id=59906
+
+        This is more consistent with Python style.
+
+        * Scripts/webkitpy/common/checkout/__init__.py:
+        * Scripts/webkitpy/common/checkout/scm_unittest.py:
+        * Scripts/webkitpy/common/host.py:
+        * Scripts/webkitpy/tool/main.py:
+
 2011-05-01  Eric Seidel  <eric@webkit.org>
 

trunk/Tools/Scripts/webkitpy/common/checkout/__init__.py

@@ -1 +1 @@
 # Required for Python to search this directory for module files
+
+from .checkout import Checkout

trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py

@@ -35 +35 @@
 import unittest
 
-from webkitpy.common.checkout.api import Checkout
-from webkitpy.common.checkout.changelog import ChangeLogEntry
-from webkitpy.common.checkout.scm import detect_scm_system, CommitMessage
+from .checkout import Checkout
+from .changelog import ChangeLogEntry
+from .scm import detect_scm_system, CommitMessage
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.common.system.executive import ScriptError

trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py

@@ -46 +46 @@
 
 from datetime import date
-from webkitpy.common.checkout.api import Checkout
+from .checkout import Checkout
 from webkitpy.common.config.committers import Committer  # FIXME: This should not be needed
 from webkitpy.common.net.bugzilla import Attachment # FIXME: This should not be needed

trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py

@@ -29 +29 @@
 
 import os
+import re
+import shutil
+import sys
 
 from webkitpy.common.memoized import memoized
@@ -34 +37 @@
 from .scm import AuthenticationError, SCM, commit_error_handler
 from webkitpy.common.system.executive import Executive, run_command, ScriptError
+from webkitpy.common.system import ospath
 
 

trunk/Tools/Scripts/webkitpy/common/host.py

@@ -29 +29 @@
 
 
-from webkitpy.common.checkout.api import Checkout
+from webkitpy.common.checkout import Checkout
 from webkitpy.common.checkout.scm import default_scm
 from webkitpy.common.config.ports import WebKitPort

trunk/Tools/Scripts/webkitpy/tool/main.py

@@ -34 +34 @@
 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
-from webkitpy.common.net.statusserver import StatusServer
-from webkitpy.common.system import executive, filesystem, platforminfo, user, workspace
-from webkitpy.layout_tests import port
 from webkitpy.tool.multicommandtool import MultiCommandTool
 from webkitpy.tool import commands

trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

@@ -16 +16 @@
                 4BFDFFA71314776C0061F24B /* HitTestResultNodeHandle_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BFDFFA61314776C0061F24B /* HitTestResultNodeHandle_Bundle.cpp */; };
                 4BFDFFA9131477770061F24B /* HitTestResultNodeHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BFDFFA8131477770061F24B /* HitTestResultNodeHandle.cpp */; };
+                97BB7AF3136E382B00D1E170 /* WTFString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BB7AF2136E382B00D1E170 /* WTFString.cpp */; };
                 BC131885117114B600B69727 /* PlatformUtilitiesMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC131884117114B600B69727 /* PlatformUtilitiesMac.mm */; };
                 BC131A9B1171316900B69727 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC131A9A1171316900B69727 /* main.mm */; };
@@ -110 +111 @@
                 4BFDFFA8131477770061F24B /* HitTestResultNodeHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HitTestResultNodeHandle.cpp; sourceTree = "<group>"; };
                 8DD76FA10486AA7600D96B5E /* TestWebKitAPI */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = TestWebKitAPI; sourceTree = BUILT_PRODUCTS_DIR; };
+                97BB7AF2136E382B00D1E170 /* WTFString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WTFString.cpp; path = WTF/WTFString.cpp; sourceTree = "<group>"; };
                 BC131883117114A800B69727 /* PlatformUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformUtilities.h; sourceTree = "<group>"; };
                 BC131884117114B600B69727 /* PlatformUtilitiesMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformUtilitiesMac.mm; sourceTree = "<group>"; };
@@ -299 +301 @@
                         isa = PBXGroup;
                         children = (
+                                97BB7AF2136E382B00D1E170 /* WTFString.cpp */,
                                 BC90964B125561BF00083756 /* VectorBasic.cpp */,
                         );
@@ -445 +448 @@
                                 BC246D9A132F1FE100B56D7C /* CanHandleRequest.cpp in Sources */,
                                 F6F3F29113342FEB00A6BF19 /* CookieManager.cpp in Sources */,
+                                97BB7AF3136E382B00D1E170 /* WTFString.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;