Move exportable_commits_since to webkitpy/w3c/common.py.

third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_exporter.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.
 
 import logging
 
 from webkitpy.w3c.local_wpt import LocalWPT
-from webkitpy.w3c.chromium_commit import ChromiumCommit
+from webkitpy.w3c.common import exportable_commits_since
 
 _log = logging.getLogger(__name__)
 
-CHROMIUM_WPT_DIR = 'third_party/WebKit/LayoutTests/external/wpt/'
-
 
 class TestExporter(object):
 
     def __init__(self, host, wpt_github, dry_run=False):
         self.host = host
         self.wpt_github = wpt_github
         self.dry_run = dry_run
         self.local_wpt = LocalWPT(self.host)
         self.local_wpt.fetch()
 
@@ skipping 46 matching lines @@
         wpt_behind_master = self.local_wpt.commits_behind_master(wpt_commit)
 
         _log.info('\nLast Chromium export commit in web-platform-tests:')
         _log.info('web-platform-tests@%s', wpt_commit)
         _log.info('(%d behind web-platform-tests@origin/master)', wpt_behind_master)
 
         _log.info('\nThe above WPT commit points to the following Chromium commit:')
         _log.info('chromium@%s', chromium_commit.sha)
         _log.info('(%d behind chromium@origin/master)', chromium_commit.num_behind_master())
 
-        exportable_commits = self.exportable_commits_since(chromium_commit.sha)
+        exportable_commits = exportable_commits_since(chromium_commit.sha, self.host, self.local_wpt)
 
         if not exportable_commits:
             _log.info('No exportable commits found in Chromium, stopping.')
             return
 
         _log.info('Found %d exportable commits in Chromium:', len(exportable_commits))
         for commit in exportable_commits:
             _log.info('- %s %s', commit, commit.subject())
 
         outbound_commit = exportable_commits[0]
@@ skipping 17 matching lines @@
         response_data = self.wpt_github.create_pr(
             remote_branch_name=remote_branch_name,
             desc_title=outbound_commit.subject(),
             body=outbound_commit.body())
 
         _log.info('Create PR response: %s', response_data)
 
         if response_data:
             data, status_code = self.wpt_github.add_label(response_data['number'])
             _log.info('Add label response (status %s): %s', status_code, data)
-
-    def exportable_commits_since(self, commit):
-        """Returns SHAs of exportable commits since `commit` in chronological order.
-
-        Args:
-            commit: The SHA of the Chromium commit from which this method will look.
-        """
-        repo_root = self.host.executive.run_command([
-            'git', 'rev-parse', '--show-toplevel'
-        ]).strip()
-
-        commits = self.host.executive.run_command([
-            'git', 'rev-list', '{}..HEAD'.format(commit), '--reverse',
-            '--', repo_root + '/' + CHROMIUM_WPT_DIR
-        ]).splitlines()
-
-        chromium_commits = [ChromiumCommit(self.host, sha=c) for c in commits]
-
-        def is_exportable(chromium_commit):
-            patch = chromium_commit.format_patch()
-            return (
-                patch
-                and self.local_wpt.test_patch(patch)
-                and 'NOEXPORT=true' not in chromium_commit.message()
-                and not chromium_commit.message().startswith('Import ')
-            )
-
-        return [c for c in chromium_commits if is_exportable(c)]