Changeset 225742 in webkit

Timestamp:

Dec 11, 2017 2:16:55 AM (6 years ago)

Author:

zandobersek@gmail.com

Message:

Unreviewed, rolling out r225737.

Breaks Git clones of the repository, including EWSs and webkitbot.

Reverted changeset:

"Add a script to automate W3c web-platform-tests pull request
creations from WebKit commits"
​https://bugs.webkit.org/show_bug.cgi?id=169462
​https://trac.webkit.org/changeset/225737

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/export-w3c-test-changes (deleted)
• Tools/Scripts/webkitpy/common/checkout/scm/git.py (modified) (5 diffs)
• Tools/Scripts/webkitpy/common/net/web.py (modified) (1 diff)
• Tools/Scripts/webkitpy/common/net/web_mock.py (modified) (2 diffs)
• Tools/Scripts/webkitpy/w3c/common.py (deleted)
• Tools/Scripts/webkitpy/w3c/test_exporter.py (deleted)
• Tools/Scripts/webkitpy/w3c/test_exporter_unittest.py (deleted)
• Tools/Scripts/webkitpy/w3c/wpt_github.py (deleted)
• Tools/Scripts/webkitpy/w3c/wpt_github_mock.py (deleted)
• Tools/Scripts/webkitpy/w3c/wpt_github_unittest.py (deleted)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-12-11  Zan Dobersek  <zdobersek@igalia.com>
+
+        Unreviewed, rolling out r225737.
+
+        Breaks Git clones of the repository, including EWSs and webkitbot.
+
+        Reverted changeset:
+
+        "Add a script to automate W3c web-platform-tests pull request
+        creations from WebKit commits"
+        https://bugs.webkit.org/show_bug.cgi?id=169462
+        https://trac.webkit.org/changeset/225737
+
 2017-12-11  Manuel Rego Casasnovas  <rego@igalia.com>
 

trunk/Tools/ChangeLog

@@ +1 @@
+2017-12-11  Zan Dobersek  <zdobersek@igalia.com>
+
+        Unreviewed, rolling out r225737.
+
+        Breaks Git clones of the repository, including EWSs and webkitbot.
+
+        Reverted changeset:
+
+        "Add a script to automate W3c web-platform-tests pull request
+        creations from WebKit commits"
+        https://bugs.webkit.org/show_bug.cgi?id=169462
+        https://trac.webkit.org/changeset/225737
+
 2017-12-11  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -30 +30 @@
 import datetime
 import logging
+import os
 import re
 
@@ -37 +38 @@
 from .commitmessage import CommitMessage
 from .scm import AuthenticationError, SCM, commit_error_handler
-from .svn import SVNRepository
+from .svn import SVN, SVNRepository
 
 _log = logging.getLogger(__name__)
@@ -507 +508 @@
         return self._run_git(['submodule', 'deinit', '-f', '.'])
 
-    def branch_ref_exists(self, branch_ref):
-        return self._run_git(['show-ref', '--quiet', '--verify', 'refs/heads/' + branch_ref], return_exit_code=True) == 0
+    def _branch_ref_exists(self, branch_ref):
+        return self._run_git(['show-ref', '--quiet', '--verify', branch_ref], return_exit_code=True) == 0
 
     def delete_branch(self, branch_name):
-        if self.branch_ref_exists(branch_name):
+        if self._branch_ref_exists('refs/heads/' + branch_name):
             self._run_git(['branch', '-D', branch_name])
 
@@ -522 +523 @@
         if not remote_branch_refs:
             remote_master_ref = 'refs/remotes/origin/master'
-            if not self.branch_ref_exists(remote_master_ref):
+            if not self._branch_ref_exists(remote_master_ref):
                 raise ScriptError(message="Can't find a branch to diff against. svn-remote.svn.fetch is not in the git config and %s does not exist" % remote_master_ref)
             return remote_master_ref
@@ -584 +585 @@
         return self._run_git(['fetch', remote])
 
-    # Reset current HEAD to the specified commit.
-    def reset_hard(self, commit):
-        return self._run_git(['reset', '--hard', commit])
-
-    def apply_mail_patch(self, options):
-        return self._run_git(['apply'] + options)
-
-    def commit(self, options):
-        return self._run_git(['commit'] + options)
-
-    def format_patch(self, options):
-        return self._run_git(['format-patch'] + options)
-
-    def request_pull(self, options):
-        return self._run_git(['request-pull'] + options)
-
-    def remote(self, options):
-        return self._run_git(['remote'] + options)
-
-    def push(self, options):
-        return self._run_git(['push'] + options)
-
-    def local_config(self, key):
-        return self._run_git(['config', '--get', '--local', key], error_handler=Executive.ignore_error)
-
-    def set_local_config(self, key, value):
-        return self._run_git(['config', '--add', '--local', key, value], error_handler=Executive.ignore_error)
-
-    def checkout_new_branch(self, branch_name):
-        return self._run_git(['checkout', '-b', branch_name])
-
     def checkout(self, revision, quiet=None):
         command = ['checkout', revision]

trunk/Tools/Scripts/webkitpy/common/net/web.py

@@ -35 +35 @@
     def get_binary(self, url, convert_404_to_None=False):
         return NetworkTransaction(convert_404_to_None=convert_404_to_None).run(lambda: urllib2.urlopen(url).read())
-
-    def request(self, method, url, data, headers=None):
-        opener = urllib2.build_opener(urllib2.HTTPHandler)
-        request = urllib2.Request(url=url, data=data)
-        request.get_method = lambda: method
-
-        if headers:
-            for key, value in headers.items():
-                request.add_header(key, value)
-        return opener.open(request)

trunk/Tools/Scripts/webkitpy/common/net/web_mock.py

@@ -28 +28 @@
 
 import StringIO
-import urllib2
+
 
 class MockWeb(object):
-    def __init__(self, urls=None, responses=[]):
+    def __init__(self, urls=None):
         self.urls = urls or {}
         self.urls_fetched = []
-        self.responses = responses
 
     def get_binary(self, url, convert_404_to_None=False):
@@ -42 +41 @@
         return "MOCK Web result, convert 404 to None=%s" % convert_404_to_None
 
-    def request(self, method, url, data, headers=None):  # pylint: disable=unused-argument
-        return MockResponse(self.responses.pop(0))
-
-
-class MockResponse(object):
-    def __init__(self, values):
-        self.status_code = values['status_code']
-        self.url = ''
-        self.body = values.get('body', '')
-
-        if int(self.status_code) >= 400:
-            raise urllib2.HTTPError(
-                url=self.url,
-                code=self.status_code,
-                msg='Received error status code: {}'.format(self.status_code),
-                hdrs={},
-                fp=None)
-
-    def getcode(self):
-        return self.status_code
-
-    def read(self):
-        return self.body
 
 # FIXME: Classes which are using Browser probably want to use Web instead.