Attachment 341262 Details for Bug 185978 – Patch

[patch] Patch

bug-185978-20180525110122.patch (text/plain), 3.35 KB, created by Ms2ger (he/him; ⌚ UTC+1/+2) on 2018-05-25 02:01:23 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ms2ger (he/him; ⌚ UTC+1/+2)

Created: 2018-05-25 02:01:23 PDT

Size: 3.35 KB

patch

obsolete

>Subversion Revision: 232184
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 645f70cdc55126738f59b029c5ef8f8aebee560a..7a4b889c917d9ac437674d2336324b95f9a86e34 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-05-25  Ms2ger  <Ms2ger@igalia.com>
>+
>+        Minor improvements to wpt exporter.
>+        https://bugs.webkit.org/show_bug.cgi?id=185978
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/webkitpy/w3c/test_exporter.py:
>+        (TestExporter.push_to_wpt_fork): Update call to create_upload_remote().
>+        (TestExporter.make_pull_request): Improve the description of the created PR.
>+        (TestExporter.create_upload_remote): Always update the remote to override any obsolete state.
>+
> 2018-05-24  Chris Dumez  <cdumez@apple.com>
> 
>         Reduce copying of FontCascadeDescription objects by moving them around
>diff --git a/Tools/Scripts/webkitpy/w3c/test_exporter.py b/Tools/Scripts/webkitpy/w3c/test_exporter.py
>index 6a9ca5bb72c1f8483064803832b2eb755119ca6c..261503f8e3edd1893474b4cb241031397d2e8274 100644
>--- a/Tools/Scripts/webkitpy/w3c/test_exporter.py
>+++ b/Tools/Scripts/webkitpy/w3c/test_exporter.py
>@@ -165,7 +165,7 @@ class TestExporter(object):
>         return True
> 
>     def push_to_wpt_fork(self):
>-        self.create_upload_remote_if_needed()
>+        self.create_upload_remote()
>         wpt_fork_branch_github_url = "https://github.com/" + self._username + "/web-platform-tests/tree/" + self._public_branch_name
>         _log.info('Pushing branch ' + self._branch_name + " to " + self._git.remote(["get-url", self._wpt_fork_remote]).rstrip())
>         _log.info('This may take some time')
>@@ -179,8 +179,11 @@ class TestExporter(object):
>             return
> 
>         _log.info('Making pull request')
>-        description = self._bugzilla.fetch_bug_dictionary(self._bug_id)["title"]
>-        pr_number = self.create_wpt_pull_request(self._wpt_fork_remote + ':' + self._public_branch_name, self._commit_message, self._commit_message + "\n" + description)
>+        title = self._bugzilla.fetch_bug_dictionary(self._bug_id)["title"].replace("[", "\\[").replace("]", "\\]")
>+        # NOTE: this should contain the exact string "WebKit export" to match the condition in
>+        # https://github.com/web-platform-tests/wpt-pr-bot/blob/f53e625c4871010277dc68336b340b5cd86e2a10/lib/metadata/index.js#L87
>+        description = "WebKit export from bug: [%s](https://bugs.webkit.org/show_bug.cgi?id=%s)" % (title, self._bug_id)
>+        pr_number = self.create_wpt_pull_request(self._wpt_fork_remote + ':' + self._public_branch_name, self._commit_message, description)
>         if pr_number:
>             try:
>                 self._github.add_label(pr_number, WEBKIT_EXPORT_PR_LABEL)
>@@ -220,9 +223,10 @@ class TestExporter(object):
>         self._filesystem.write_text_file(patch_file, patch_data)
>         return patch_file
> 
>-    def create_upload_remote_if_needed(self):
>-        if not self._wpt_fork_remote in self._git.remote([]):
>-            self._git.remote(["add", self._wpt_fork_remote, self._wpt_fork_push_url])
>+    def create_upload_remote(self):
>+        if self._wpt_fork_remote in self._git.remote([]).splitlines():
>+            self._git.remote(["remove", self._wpt_fork_remote])
>+        self._git.remote(["add", self._wpt_fork_remote, self._wpt_fork_push_url])
> 
>     def do_export(self):
>         git_patch_file = self.create_git_patch()

Actions: View | Formatted Diff | Diff

Attachments on bug 185978: 341262 | 341304