[WPT Export] Use github remote, not origin

third_party/WebKit/Tools/Scripts/webkitpy/w3c/local_wpt.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A utility class for interacting with a local checkout of the Web Platform Tests."""
 
 import logging
 
 from webkitpy.common.system.executive import ScriptError
 from webkitpy.w3c.chromium_commit import ChromiumCommit
@@ skipping 17 matching lines @@
                 web-platform-tests repo is already checked out at this path.
         """
         self.host = host
         self.path = path
         self.branch_name = 'chromium-export-try'
 
     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', 'checkout', 'origin/master'])
+            self.run(['git', 'checkout', 'github/master'])
         else:
             _log.info('Cloning %s into %s', WPT_REPO_URL, self.path)

[qyearsley, 2017/02/17 19:18:41]

Question: Would it make sense to change this to use
github.com/w3c/web-platform-tests instead of WPT_REPO_URL here?

             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])
 
     def run(self, command, **kwargs):
         """Runs a command in the local WPT directory."""
         return self.host.executive.run_command(command, cwd=self.path, **kwargs)
 
     def most_recent_chromium_commit(self):
         """Finds the most recent commit in WPT with a Chromium commit position."""
         wpt_commit_hash = self.run(['git', 'rev-list', 'HEAD', '-n', '1', '--grep=Cr-Commit-Position'])
         if not wpt_commit_hash:
             return None, None
 
         wpt_commit_hash = wpt_commit_hash.strip()
         position = self.run(['git', 'footers', '--position', wpt_commit_hash])
         position = position.strip()
         assert position
 
         chromium_commit = ChromiumCommit(self.host, position=position)
         return wpt_commit_hash, chromium_commit
 
     def clean(self):
         self.run(['git', 'reset', '--hard', 'HEAD'])
         self.run(['git', 'clean', '-fdx'])
-        self.run(['git', 'checkout', 'origin/master'])
+        self.run(['git', 'checkout', 'github/master'])
         if self.branch_name in self.all_branches():
             self.run(['git', 'branch', '-D', self.branch_name])
 
     def all_branches(self):
         """Returns a list of local and remote branches."""
         return [s.strip() for s in self.run(['git', 'branch', '-a']).splitlines()]
 
     def create_branch_with_patch(self, message, patch, author):
         """Commits the given patch and pushes to the upstream repo.
 
@@ skipping 17 matching lines @@
         # TODO(jeffcarp): Use git am -p<n> where n is len(CHROMIUM_WPT_DIR.split(/'))
         # or something not off-by-one.
         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])
 
         return self.branch_name
 
     def test_patch(self, patch, chromium_commit=None):
-        """Returns the expected output of a patch against origin/master.
+        """Returns the expected output of a patch against github/master.
 
         Args:
             patch: The patch to test against.
 
         Returns:
             A string containing the diff the patch produced.
         """
         self.clean()
 
         # Remove Chromium WPT directory prefix.
         patch = patch.replace(CHROMIUM_WPT_DIR, '')
 
         try:
             self.run(['git', 'apply', '-'], input=patch)
             self.run(['git', 'add', '.'])
-            output = self.run(['git', 'diff', 'origin/master'])
+            output = self.run(['git', 'diff', 'github/master'])
         except ScriptError:
             _log.warning('Patch did not apply cleanly, skipping.')
             if chromium_commit:
                 _log.warning('Commit details:\n%s\n%s', chromium_commit.sha,
                              chromium_commit.subject())
             output = ''
 
         self.clean()
         return output
 
     def commits_behind_master(self, commit):
-        """Returns the number of commits after the given commit on origin/master.
+        """Returns the number of commits after the given commit on github/master.
 
         This doesn't include the given commit, and this assumes that the given
         commit is on the the master branch.
         """
         return len(self.run([
-            'git', 'rev-list', '{}..origin/master'.format(commit)
+            'git', 'rev-list', '{}..github/master'.format(commit)
         ]).splitlines())