2018-09-16 17:24:07 +00:00
|
|
|
#!/usr/bin/env python
|
|
|
|
|
2018-09-14 05:02:16 +00:00
|
|
|
"""Git helper functions.
|
|
|
|
|
2018-09-16 17:24:07 +00:00
|
|
|
Everything here should be project agnostic: it shouldn't rely on project's
|
|
|
|
structure, or make assumptions about the passed arguments or calls' outcomes.
|
2018-09-14 05:02:16 +00:00
|
|
|
"""
|
|
|
|
|
|
|
|
import os
|
2020-04-08 15:59:14 +00:00
|
|
|
import re
|
2018-09-14 05:02:16 +00:00
|
|
|
import subprocess
|
2020-04-08 15:59:14 +00:00
|
|
|
import sys
|
2018-09-14 05:02:16 +00:00
|
|
|
|
|
|
|
|
|
|
|
def is_repo_root(path):
|
|
|
|
path_exists = os.path.exists(path)
|
|
|
|
if not path_exists:
|
|
|
|
return False
|
|
|
|
|
|
|
|
git_folder_path = os.path.join(path, '.git')
|
|
|
|
git_folder_exists = os.path.exists(git_folder_path)
|
|
|
|
|
|
|
|
return git_folder_exists
|
|
|
|
|
|
|
|
|
|
|
|
def get_repo_root(path):
|
|
|
|
"""Finds a closest ancestor folder which is a repo root."""
|
|
|
|
norm_path = os.path.normpath(path)
|
|
|
|
norm_path_exists = os.path.exists(norm_path)
|
|
|
|
if not norm_path_exists:
|
|
|
|
return None
|
|
|
|
|
|
|
|
if is_repo_root(norm_path):
|
|
|
|
return norm_path
|
|
|
|
|
|
|
|
parent_path = os.path.dirname(norm_path)
|
|
|
|
|
|
|
|
# Check if we're in the root folder already.
|
|
|
|
if parent_path == norm_path:
|
|
|
|
return None
|
|
|
|
|
|
|
|
return get_repo_root(parent_path)
|
|
|
|
|
|
|
|
|
2019-04-03 19:42:49 +00:00
|
|
|
def am(repo, patch_data, threeway=False, directory=None, exclude=None,
|
2018-10-24 18:24:11 +00:00
|
|
|
committer_name=None, committer_email=None):
|
|
|
|
args = []
|
|
|
|
if threeway:
|
|
|
|
args += ['--3way']
|
2018-12-11 21:49:01 +00:00
|
|
|
if directory is not None:
|
|
|
|
args += ['--directory', directory]
|
2019-04-03 19:42:49 +00:00
|
|
|
if exclude is not None:
|
|
|
|
for path_pattern in exclude:
|
|
|
|
args += ['--exclude', path_pattern]
|
|
|
|
|
2018-10-24 18:24:11 +00:00
|
|
|
root_args = ['-C', repo]
|
|
|
|
if committer_name is not None:
|
|
|
|
root_args += ['-c', 'user.name=' + committer_name]
|
|
|
|
if committer_email is not None:
|
|
|
|
root_args += ['-c', 'user.email=' + committer_email]
|
2019-03-08 02:11:31 +00:00
|
|
|
root_args += ['-c', 'commit.gpgsign=false']
|
2018-10-24 18:24:11 +00:00
|
|
|
command = ['git'] + root_args + ['am'] + args
|
|
|
|
proc = subprocess.Popen(
|
|
|
|
command,
|
|
|
|
stdin=subprocess.PIPE)
|
2019-08-23 22:48:27 +00:00
|
|
|
proc.communicate(patch_data.encode('utf-8'))
|
2018-10-24 18:24:11 +00:00
|
|
|
if proc.returncode != 0:
|
|
|
|
raise RuntimeError("Command {} returned {}".format(command,
|
|
|
|
proc.returncode))
|
|
|
|
|
|
|
|
|
2018-09-16 17:24:07 +00:00
|
|
|
def apply_patch(repo, patch_path, directory=None, index=False, reverse=False):
|
2018-10-24 18:24:11 +00:00
|
|
|
args = ['git', '-C', repo, 'apply',
|
2018-09-14 05:02:16 +00:00
|
|
|
'--ignore-space-change',
|
|
|
|
'--ignore-whitespace',
|
|
|
|
'--whitespace', 'fix'
|
|
|
|
]
|
|
|
|
if directory:
|
|
|
|
args += ['--directory', directory]
|
|
|
|
if index:
|
|
|
|
args += ['--index']
|
|
|
|
if reverse:
|
|
|
|
args += ['--reverse']
|
|
|
|
args += ['--', patch_path]
|
|
|
|
|
2018-10-24 18:24:11 +00:00
|
|
|
return_code = subprocess.call(args)
|
|
|
|
applied_successfully = (return_code == 0)
|
|
|
|
return applied_successfully
|
2018-09-14 05:02:16 +00:00
|
|
|
|
|
|
|
|
2019-04-23 17:28:26 +00:00
|
|
|
def import_patches(repo, **kwargs):
|
|
|
|
"""same as am(), but we save the upstream HEAD so we can refer to it when we
|
|
|
|
later export patches"""
|
|
|
|
update_ref(
|
|
|
|
repo=repo,
|
|
|
|
ref='refs/patches/upstream-head',
|
|
|
|
newvalue='HEAD'
|
|
|
|
)
|
|
|
|
am(repo=repo, **kwargs)
|
|
|
|
|
|
|
|
|
2018-09-14 05:02:16 +00:00
|
|
|
def get_patch(repo, commit_hash):
|
2018-10-24 18:24:11 +00:00
|
|
|
args = ['git', '-C', repo, 'diff-tree',
|
2018-09-14 05:02:16 +00:00
|
|
|
'-p',
|
|
|
|
commit_hash,
|
2018-09-16 17:24:07 +00:00
|
|
|
'--' # Explicitly tell Git `commit_hash` is a revision, not a path.
|
2018-09-14 05:02:16 +00:00
|
|
|
]
|
|
|
|
|
2018-10-24 18:24:11 +00:00
|
|
|
return subprocess.check_output(args)
|
2018-09-14 05:02:16 +00:00
|
|
|
|
|
|
|
|
|
|
|
def get_head_commit(repo):
|
2018-10-24 18:24:11 +00:00
|
|
|
args = ['git', '-C', repo, 'rev-parse', 'HEAD']
|
2018-09-14 05:02:16 +00:00
|
|
|
|
2018-10-24 18:24:11 +00:00
|
|
|
return subprocess.check_output(args).strip()
|
2018-09-14 05:02:16 +00:00
|
|
|
|
|
|
|
|
2019-04-17 18:16:03 +00:00
|
|
|
def update_ref(repo, ref, newvalue):
|
|
|
|
args = ['git', '-C', repo, 'update-ref', ref, newvalue]
|
|
|
|
|
|
|
|
return subprocess.check_call(args)
|
|
|
|
|
|
|
|
|
2018-09-14 05:02:16 +00:00
|
|
|
def reset(repo):
|
2018-10-24 18:24:11 +00:00
|
|
|
args = ['git', '-C', repo, 'reset']
|
2018-09-14 05:02:16 +00:00
|
|
|
|
2018-10-24 18:24:11 +00:00
|
|
|
subprocess.check_call(args)
|
2018-09-14 05:02:16 +00:00
|
|
|
|
|
|
|
|
|
|
|
def commit(repo, author, message):
|
2020-04-08 15:59:14 +00:00
|
|
|
"""Commit whatever in the index is now."""
|
2018-09-14 05:02:16 +00:00
|
|
|
|
|
|
|
# Let's setup committer info so git won't complain about it being missing.
|
|
|
|
# TODO: Is there a better way to set committer's name and email?
|
|
|
|
env = os.environ.copy()
|
|
|
|
env['GIT_COMMITTER_NAME'] = 'Anonymous Committer'
|
|
|
|
env['GIT_COMMITTER_EMAIL'] = 'anonymous@electronjs.org'
|
|
|
|
|
2018-10-24 18:24:11 +00:00
|
|
|
args = ['git', '-C', repo, 'commit',
|
2018-09-14 05:02:16 +00:00
|
|
|
'--author', author,
|
|
|
|
'--message', message
|
|
|
|
]
|
|
|
|
|
2018-10-24 18:24:11 +00:00
|
|
|
return_code = subprocess.call(args, env=env)
|
|
|
|
committed_successfully = (return_code == 0)
|
|
|
|
return committed_successfully
|
2020-04-08 15:59:14 +00:00
|
|
|
|
|
|
|
def get_upstream_head(repo):
|
|
|
|
args = [
|
|
|
|
'git',
|
|
|
|
'-C',
|
|
|
|
repo,
|
|
|
|
'rev-parse',
|
|
|
|
'--verify',
|
|
|
|
'refs/patches/upstream-head',
|
|
|
|
]
|
|
|
|
return subprocess.check_output(args).strip()
|
|
|
|
|
|
|
|
def get_commit_count(repo, commit_range):
|
|
|
|
args = [
|
|
|
|
'git',
|
|
|
|
'-C',
|
|
|
|
repo,
|
|
|
|
'rev-list',
|
|
|
|
'--count',
|
|
|
|
commit_range
|
|
|
|
]
|
|
|
|
return int(subprocess.check_output(args).strip())
|
|
|
|
|
|
|
|
def guess_base_commit(repo):
|
|
|
|
"""Guess which commit the patches might be based on"""
|
|
|
|
try:
|
|
|
|
upstream_head = get_upstream_head(repo)
|
|
|
|
num_commits = get_commit_count(repo, upstream_head + '..')
|
|
|
|
return [upstream_head, num_commits]
|
|
|
|
except subprocess.CalledProcessError:
|
|
|
|
args = [
|
|
|
|
'git',
|
|
|
|
'-C',
|
|
|
|
repo,
|
|
|
|
'describe',
|
|
|
|
'--tags',
|
|
|
|
]
|
|
|
|
return subprocess.check_output(args).rsplit('-', 2)[0:2]
|
|
|
|
|
|
|
|
|
|
|
|
def format_patch(repo, since):
|
|
|
|
args = [
|
|
|
|
'git',
|
|
|
|
'-C',
|
|
|
|
repo,
|
|
|
|
'-c',
|
|
|
|
'core.attributesfile=' + os.path.join(os.path.dirname(os.path.realpath(__file__)), '.electron.attributes'),
|
|
|
|
# Ensure it is not possible to match anything
|
|
|
|
# Disabled for now as we have consistent chunk headers
|
|
|
|
# '-c',
|
|
|
|
# 'diff.electron.xfuncname=$^',
|
|
|
|
'format-patch',
|
|
|
|
'--keep-subject',
|
|
|
|
'--no-stat',
|
|
|
|
'--stdout',
|
|
|
|
|
|
|
|
# Per RFC 3676 the signature is separated from the body by a line with
|
|
|
|
# '-- ' on it. If the signature option is omitted the signature defaults
|
|
|
|
# to the Git version number.
|
|
|
|
'--no-signature',
|
|
|
|
|
|
|
|
# The name of the parent commit object isn't useful information in this
|
|
|
|
# context, so zero it out to avoid needless patch-file churn.
|
|
|
|
'--zero-commit',
|
|
|
|
|
|
|
|
# Some versions of git print out different numbers of characters in the
|
|
|
|
# 'index' line of patches, so pass --full-index to get consistent
|
|
|
|
# behaviour.
|
|
|
|
'--full-index',
|
|
|
|
since
|
|
|
|
]
|
|
|
|
return subprocess.check_output(args)
|
|
|
|
|
|
|
|
|
|
|
|
def split_patches(patch_data):
|
|
|
|
"""Split a concatenated series of patches into N separate patches"""
|
|
|
|
patches = []
|
|
|
|
patch_start = re.compile('^From [0-9a-f]+ ')
|
|
|
|
for line in patch_data.splitlines():
|
|
|
|
if patch_start.match(line):
|
|
|
|
patches.append([])
|
|
|
|
patches[-1].append(line)
|
|
|
|
return patches
|
|
|
|
|
|
|
|
|
|
|
|
def munge_subject_to_filename(subject):
|
|
|
|
"""Derive a suitable filename from a commit's subject"""
|
|
|
|
if subject.endswith('.patch'):
|
|
|
|
subject = subject[:-6]
|
|
|
|
return re.sub(r'[^A-Za-z0-9-]+', '_', subject).strip('_').lower() + '.patch'
|
|
|
|
|
|
|
|
|
|
|
|
def get_file_name(patch):
|
|
|
|
"""Return the name of the file to which the patch should be written"""
|
|
|
|
for line in patch:
|
|
|
|
if line.startswith('Patch-Filename: '):
|
|
|
|
return line[len('Patch-Filename: '):]
|
|
|
|
# If no patch-filename header, munge the subject.
|
|
|
|
for line in patch:
|
|
|
|
if line.startswith('Subject: '):
|
|
|
|
return munge_subject_to_filename(line[len('Subject: '):])
|
|
|
|
|
|
|
|
|
|
|
|
def remove_patch_filename(patch):
|
|
|
|
"""Strip out the Patch-Filename trailer from a patch's message body"""
|
|
|
|
force_keep_next_line = False
|
|
|
|
for i, l in enumerate(patch):
|
|
|
|
is_patchfilename = l.startswith('Patch-Filename: ')
|
|
|
|
next_is_patchfilename = i < len(patch) - 1 and patch[i+1].startswith('Patch-Filename: ')
|
|
|
|
if not force_keep_next_line and (is_patchfilename or (next_is_patchfilename and len(l.rstrip()) == 0)):
|
|
|
|
pass # drop this line
|
|
|
|
else:
|
|
|
|
yield l
|
|
|
|
force_keep_next_line = l.startswith('Subject: ')
|
|
|
|
|
|
|
|
|
2020-06-05 00:43:28 +00:00
|
|
|
def export_patches(repo, out_dir, patch_range=None, dry_run=False):
|
2020-04-08 15:59:14 +00:00
|
|
|
if patch_range is None:
|
|
|
|
patch_range, num_patches = guess_base_commit(repo)
|
|
|
|
sys.stderr.write("Exporting {} patches since {}\n".format(num_patches, patch_range))
|
|
|
|
patch_data = format_patch(repo, patch_range)
|
|
|
|
patches = split_patches(patch_data)
|
|
|
|
|
|
|
|
try:
|
|
|
|
os.mkdir(out_dir)
|
|
|
|
except OSError:
|
|
|
|
pass
|
|
|
|
|
2020-06-05 00:43:28 +00:00
|
|
|
if dry_run:
|
|
|
|
# If we're doing a dry run, iterate through each patch and see if the newly
|
|
|
|
# exported patch differs from what exists. Report number of mismatched patches
|
|
|
|
# and fail if there's more than one.
|
|
|
|
patch_count = 0
|
2020-04-08 15:59:14 +00:00
|
|
|
for patch in patches:
|
|
|
|
filename = get_file_name(patch)
|
2020-06-05 00:43:28 +00:00
|
|
|
filepath = os.path.join(out_dir, filename)
|
|
|
|
existing_patch = open(filepath, 'r').read()
|
|
|
|
formatted_patch = '\n'.join(remove_patch_filename(patch)).rstrip('\n') + '\n'
|
|
|
|
if formatted_patch != existing_patch:
|
|
|
|
patch_count += 1
|
|
|
|
if patch_count > 0:
|
|
|
|
sys.stderr.write("Patches not up to date: {} patches need update\n".format(patch_count))
|
|
|
|
exit(1)
|
|
|
|
else:
|
|
|
|
# Remove old patches so that deleted commits are correctly reflected in the
|
|
|
|
# patch files (as a removed file)
|
|
|
|
for p in os.listdir(out_dir):
|
|
|
|
if p.endswith('.patch'):
|
|
|
|
os.remove(os.path.join(out_dir, p))
|
|
|
|
with open(os.path.join(out_dir, '.patches'), 'w') as pl:
|
|
|
|
for patch in patches:
|
|
|
|
filename = get_file_name(patch)
|
|
|
|
file_path = os.path.join(out_dir, filename)
|
|
|
|
formatted_patch = '\n'.join(remove_patch_filename(patch)).rstrip('\n') + '\n'
|
|
|
|
with open(file_path, 'w') as f:
|
|
|
|
f.write(formatted_patch)
|
|
|
|
pl.write(filename + '\n')
|
|
|
|
|