def _exportable_commits_since(chromium_commit_hash, host, local_wpt, wpt_github,
require_clean=True, verify_merged_pr=False):
"""Lists exportable commits after the given commit.
Args:
chromium_commit_hash: The SHA of the Chromium commit from which this
method will look. This commit is not included in the commits searched.
Return values and remaining arguments are the same as exportable_commits_over_last_n_commits.
"""
chromium_repo_root = host.executive.run_command([
'git', 'rev-parse', '--show-toplevel'
], cwd=absolute_chromium_dir(host)).strip()
wpt_path = chromium_repo_root + '/' + CHROMIUM_WPT_DIR
commit_range = '{}..HEAD'.format(chromium_commit_hash)
commit_hashes = host.executive.run_command([
'git', 'rev-list', commit_range, '--reverse', '--', wpt_path
], cwd=absolute_chromium_dir(host)).splitlines()
chromium_commits = [ChromiumCommit(host, sha=sha) for sha in commit_hashes]
exportable_commits = []
errors = []
for commit in chromium_commits:
state, error = get_commit_export_state(commit, local_wpt, wpt_github, verify_merged_pr)
if require_clean:
success = state == CommitExportState.EXPORTABLE_CLEAN
else:
success = state in (CommitExportState.EXPORTABLE_CLEAN, CommitExportState.EXPORTABLE_DIRTY)
if success:
exportable_commits.append(commit)
elif error != '':
errors.append('The following commit did not apply cleanly:\nSubject: %s (%s)\n%s' %
(commit.subject(), commit.url(), error))
return exportable_commits, errors
def _exportable_commits_since(chromium_commit_hash, host, local_wpt,
wpt_github):
"""Lists exportable commits after a certain point.
Args:
chromium_commit_hash: The SHA of the Chromium commit from which this
method will look. This commit is not included in the commits searched.
host: A Host object.
local_wpt: A LocalWPT instance.
wpt_github: A WPTGitHub instance.
Returns:
A list of ChromiumCommit objects for commits that are exportable after
the given commit, in chronological order.
"""
chromium_repo_root = host.executive.run_command(
['git', 'rev-parse', '--show-toplevel'],
cwd=absolute_chromium_dir(host)).strip()
wpt_path = chromium_repo_root + '/' + CHROMIUM_WPT_DIR
commit_range = '{}..HEAD'.format(chromium_commit_hash)
commit_hashes = host.executive.run_command(
['git', 'rev-list', commit_range, '--reverse', '--', wpt_path],
cwd=absolute_chromium_dir(host)).splitlines()
chromium_commits = [ChromiumCommit(host, sha=sha) for sha in commit_hashes]
exportable_commits = []
for commit in chromium_commits:
if is_exportable(commit, local_wpt, wpt_github):
exportable_commits.append(commit)
return exportable_commits
def __init__(self, host, sha=None, position=None):
"""
Args:
host: A Host object
sha: A Chromium commit SHA
position: A string of the form:
'Cr-Commit-Position: refs/heads/master@{#431915}'
or just:
'refs/heads/master@{#431915}'
"""
self.host = host
self.absolute_chromium_dir = absolute_chromium_dir(host)
self.absolute_chromium_wpt_dir = absolute_chromium_wpt_dir(host)
assert sha or position, 'requires sha or position'
assert not (sha and position), 'cannot accept both sha and position'
if position and not sha:
if position.startswith('Cr-Commit-Position: '):
position = position[len('Cr-Commit-Position: '):]
sha = self.position_to_sha(position)
assert len(sha) == 40, 'Expected SHA-1 hash, got {}'.format(sha)
self.sha = sha
self.position = position
def __init__(self, host, sha=None, position=None):
"""Initializes a ChomiumCommit object, given a sha or commit position.
Args:
host: A Host object.
sha: A Chromium commit SHA hash.
position: A commit position footer string of the form:
'Cr-Commit-Position: refs/heads/master@{#431915}'
or just the commit position string:
'refs/heads/master@{#431915}'
"""
self.host = host
self.absolute_chromium_dir = absolute_chromium_dir(host)
self.absolute_chromium_wpt_dir = absolute_chromium_wpt_dir(host)
assert sha or position, 'requires sha or position'
assert not (sha and position), 'cannot accept both sha and position'
if position:
if position.startswith('Cr-Commit-Position: '):
position = position[len('Cr-Commit-Position: '):]
sha = self.position_to_sha(position)
else:
position = self.sha_to_position(sha)
assert len(sha) == 40, 'Expected SHA-1 hash, got {}'.format(sha)
assert sha and position, 'ChromiumCommit should have sha and position after __init__'
self.sha = sha
self.position = position
def fetch_current_revision_commit(self, host):
"""Fetches the git commit for the latest revision of CL.
This method fetches the commit corresponding to the latest revision of
CL to local Chromium repository, but does not checkout the commit to the
working tree. All changes in the CL are squashed into this one commit,
regardless of how many revisions have been uploaded.
Args:
host: A Host object for git invocation.
Returns:
A ChromiumCommit object (the fetched commit).
"""
git = host.git(absolute_chromium_dir(host))
url = self.current_revision['fetch']['http']['url']
ref = self.current_revision['fetch']['http']['ref']
git.run(['fetch', url, ref])
sha = git.run(['rev-parse', 'FETCH_HEAD']).strip()
return ChromiumCommit(host, sha=sha)