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
|
|
|
|
import subprocess
|
|
|
|
|
|
|
|
|
|
|
|
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)
|
|
|
|
proc.communicate(patch_data)
|
|
|
|
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):
|
|
|
|
""" Commit whatever in the index is now."""
|
|
|
|
|
|
|
|
# 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
|