Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(207)

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/w3c/local_wpt.py

Issue 2703663005: [WPT Export] Use github remote, not origin (Closed)
Patch Set: Simplify to only rely on origin, remove git remote check Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Tools/Scripts/webkitpy/w3c/local_wpt.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/local_wpt.py b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/local_wpt.py
index 0081f9e6ad1327ba7502ba2fc31c1cc96a64773e..6c9b0ecebf62a48f2f777851101cf72e20e00921 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/local_wpt.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/local_wpt.py
@@ -8,12 +8,9 @@ import logging
from webkitpy.common.system.executive import ScriptError
from webkitpy.w3c.chromium_commit import ChromiumCommit
-from webkitpy.w3c.common import WPT_REPO_URL, CHROMIUM_WPT_DIR
+from webkitpy.w3c.common import WPT_GH_REPO_URL, CHROMIUM_WPT_DIR
-WPT_SSH_URL = 'git@github.com:w3c/web-platform-tests.git'
-REMOTE_NAME = 'github'
-
_log = logging.getLogger(__name__)
@@ -34,14 +31,11 @@ class LocalWPT(object):
def fetch(self):
if self.host.filesystem.exists(self.path):
_log.info('WPT checkout exists at %s, fetching latest', self.path)
- self.run(['git', 'fetch', '--all'])
+ self.run(['git', 'fetch', 'origin'])
self.run(['git', 'checkout', 'origin/master'])
else:
- _log.info('Cloning %s into %s', WPT_REPO_URL, self.path)
- self.host.executive.run_command(['git', 'clone', WPT_REPO_URL, self.path])
-
- if REMOTE_NAME not in self.run(['git', 'remote']):
- self.run(['git', 'remote', 'add', REMOTE_NAME, WPT_SSH_URL])
+ _log.info('Cloning %s into %s', WPT_GH_REPO_URL, self.path)
+ self.host.executive.run_command(['git', 'clone', WPT_GH_REPO_URL, self.path])
def run(self, command, **kwargs):
"""Runs a command in the local WPT directory."""
@@ -97,7 +91,7 @@ class LocalWPT(object):
self.run(['git', 'apply', '-'], input=patch)
self.run(['git', 'add', '.'])
self.run(['git', 'commit', '--author', author, '-am', message])
- self.run(['git', 'push', '-f', REMOTE_NAME, self.branch_name])
+ self.run(['git', 'push', '-f', 'origin', self.branch_name])
return self.branch_name

Powered by Google App Engine
This is Rietveld 408576698