69f1731bbb
* chore: bump chromium in DEPS to cbdeef954dfc34e94c8ca9cf72ad326b4a121158 * chore: bump chromium in DEPS to 29723f905baeab1d4228eef2c31cdb341ebeffe0 * chore: bump chromium in DEPS to 44d6d78e852137fff58c14ed26ab1e803e5bf822 * update patches * chore: bump chromium in DEPS to 8a3a0fccb39d6b8334c9a0496c0d5056e50cdb3f * chore: update patches * refactor: fix PrintBackend::CreateInstance() calls Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2354541 * chore: bump chromium in DEPS to b9ebec3bcb1cabdd1426f367636f54cc98e0500e * chore: remove patches to code that was deleted upstream CL: https://chromium-review.googlesource.com/c/chromium/src/+/2360314 * Remove uses of kCGColorSpaceITUR_2020_PQ_EOTF/HLG CL: https://chromium-review.googlesource.com/c/chromium/src/+/2363950 just garden variety code shear * chore: update patch indices * Move ColorModel to //printing/mojom/print.mojom https://chromium-review.googlesource.com/c/chromium/src/+/2355083 sync with printing ColorModel changes: moved to mojo, different naming scheme * chore: bump chromium in DEPS to 56c4b4d2ce5ba941acd2e0fdb5100e8a48847134 * chore: bump chromium in DEPS to 130501f220b684a79dc82c17e236e63ac1f2a093 * Convert PrintHostMsg_DidGetPrintedPagesCount to Mojo https://chromium-review.googlesource.com/c/chromium/src/+/2326857 Update argument list to Print() * chore: update patch indices * DumpAccTree: convert utf16 to utf8 in PropertyFilter https://chromium-review.googlesource.com/c/chromium/src/+/2360218 * chore: bump chromium in DEPS to 3058368c6646e0dc8be6f8ea838b0343428b7998 * chore: bump chromium in DEPS to f51b4e6555364363c61438dac7afd988c8347bfc * chore: bump chromium in DEPS to 2dcc6f8fc23ac41b2499eb69dee0b4017e9d1046 * update patches * chore: bump chromium in DEPS to 2d8e98ecedc7e4905540b053bc1c87e964715be5 * update patches * 2345900: Move content::RecordContentToVisibleTimeRequest struct to mojo https://chromium-review.googlesource.com/c/chromium/src/+/2345900 * update patches * 2345900: Move content::RecordContentToVisibleTimeRequest struct to mojo https://chromium-review.googlesource.com/c/chromium/src/+/2345900 * 2367394: Remove net::LOAD_DO_NOT_SEND_COOKIES and net::LOAD_DO_NOT_SEND_AUTH_DATA. https://chromium-review.googlesource.com/c/chromium/src/+/2367394 * 2373227: [XProto] Consolidate all <X11/*> includes to //ui/gfx/x/x11.h https://chromium-review.googlesource.com/c/chromium/src/+/2373227 * fixup! 2373227: [XProto] Consolidate all <X11/*> includes to //ui/gfx/x/x11.h * chore: bump chromium in DEPS to c090e3f960520cbd2328608b97f87238c76d6143 * update patches * chore: bump chromium in DEPS to 13a25e0a755de9a14271022c595f3d2e29829e1a * chore: bump chromium in DEPS to 6adbb767b012c41efaeab0d1bdbb3eefed0977bc * chore: bump chromium in DEPS to 339ec5455c5932ef1322ea9953a6349b0732199e * chore: bump chromium in DEPS to 20291807c33f7ef4ef4f57d62075e099b027bfe6 * chore: bump chromium in DEPS to 226fbd1b8b17d4ac84fdb9548ef3a1c646878d47 * update patches * fixup disable_color_correct_rendering patch * chore: bump chromium in DEPS to 577c45979cad4359f2e206d68efd9317d3d79315 * update patches * viz: Rename RenderPass to CompositorRenderPass (and related types). https://chromium-review.googlesource.com/c/chromium/src/+/2380730 * chore: bump chromium in DEPS to 37e2ad5303f2c03a1b5d8eda65341bf2561196cd * update patches * add kOmitCookies_Electron * update patch * chore: bump chromium in DEPS to 256e42409ea63a7e71016de07818a983a97db463 * update patches * fix worker script ready hook https://chromium-review.googlesource.com/c/chromium/src/+/2335713 * Fixup printing page ranges patch * [printing] Move PrintMsg_PrintPages_Params to print.mojom https://chromium-review.googlesource.com/c/chromium/src/+/2340854 * Add MIME sniffer overloads that take base::StringPieces https://chromium-review.googlesource.com/c/chromium/src/+/2382896 * [printing] Move PrintHostMsg_PreviewIds to print.mojom https://chromium-review.googlesource.com/c/chromium/src/+/2379455 * fixup test due to new DCHECK https://chromium-review.googlesource.com/c/chromium/src/+/2333750 * stop sending cookies when useSessionCookies is false * chore: bump chromium in DEPS to dd429dbc556449951ee8160d8a4d61fd95a139d5 * update patches * chore: bump chromium in DEPS to 5202bde3f9f44c2065f5dacf27e7000dd19e4e4d * chore: bump chromium in DEPS to 099e8e07b89da65932431bb0fd51b6f7f5344c19 * chore: bump chromium in DEPS to 104e5da2a43b759732d5b94bfc750b3a9a639653 * chore: bump chromium in DEPS to a4519ce657af25834e355315fd7fefa77b13426a * update patches * Make FileURLLoaderFactory always owned by its |receivers_|. https://chromium-review.googlesource.com/c/chromium/src/+/2337411 * Make FileURLLoaderFactory always owned by its |receivers_|. https://chromium-review.googlesource.com/c/chromium/src/+/2337411 * chore: bump chromium in DEPS to 1b62e9e8c8eaf6b8e3a9c77ee67a4c1bfa6a4d6b * chore: update patches * fixup! Make FileURLLoaderFactory always owned by its |receivers_|. * chore: update patches - mac: Disable CoreServices _CSCheckFix. https://chromium-review.googlesource.com/c/chromium/src/+/2401334 - [XProto] Remove bad DCHECK in x11_error_tracker.cc https://chromium-review.googlesource.com/c/chromium/src/+/2402304 - Move content/browser/frame_host/* over to content/browser/renderer_host/ https://chromium-review.googlesource.com/c/chromium/src/+/2401303 * Refactor WebContentSettingsClient to dedupe AllowXYZ methods https://chromium-review.googlesource.com/c/chromium/src/+/2353552 * Introduce NonNetworkURLLoaderFactoryBase class. https://chromium-review.googlesource.com/c/chromium/src/+/2357559 * [XProto] Remove usage of all Xlib headers https://chromium-review.googlesource.com/c/chromium/src/+/2392140 * fixup! chore: update patches * chore: bump chromium in DEPS to c1df55fbeb8207d036a604f59e4ea4e8ee79930a * chore: update patches * Move content::WebPreferences struct to Blink https://chromium-review.googlesource.com/c/chromium/src/+/2397670 * chore: bump chromium in DEPS to 57a23ec4884fff6c2f8d9b8536131cdc9b551ec2 * Set appid on Pip windows. https://chromium-review.googlesource.com/c/chromium/src/+/2388274 * fixup! Set appid on Pip windows. * fix: add a patch to remove deprecated factory * chore: bump chromium in DEPS to 1a9ddb7ea43955877823d5c4dcbf241b64228635 * fix compilation on windows * chore: bump chromium in DEPS to 234e6c6a77f61ffad9335099d9b13892cf88fd44 * chore: update patches * chore: bump chromium in DEPS to 7631eb0a9f57a8a47d3c28e1d265961b3a4d6b2b * chore: update patches * chore: bump chromium in DEPS to f9c34cd485845b95c2d17a7f55fdf92cda9a1b3a * chore: update patches * chore: implement GetSurveyAPIKey Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2362182 * chore: replace CreateWebUIURLLoader with CreateWebUIURLLoaderFactory Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2358309 * chore: bump chromium in DEPS to 5bdbd2373da884adf41c087be1465fcc344d168c * chore: update node patches for common.gypi * chore: update patches * chore: non_network_url_loader_factory_base was moved Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2357431 * 2415752: Reland "Reland "OOR-CORS: Remove BlinkCORS supporting code outside Blink"" Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2415752 * chore: bump chromium in DEPS to b943d006a33ec5bc1743792d64724693eb357083 * fix: replace x11::None with x11::Window::None * chore: update patches * chore: update patches * fix: cast x11::Window to int * 2402123: Use end date when deleting http auth cache Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2402123 * 2320268: Migrate DragHostMsg_StartDragging to Mojo Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2320268 * 2401303: Move content/browser/frame_host/* over to content/browser/renderer_host/ https://chromium-review.googlesource.com/c/chromium/src/+/2401303 * chore: fix lint * chore: fix build * Update config.yml Co-authored-by: Electron Bot <anonymous@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: Samuel Attard <sattard@slack-corp.com>
304 lines
8.6 KiB
Python
304 lines
8.6 KiB
Python
#!/usr/bin/env python
|
|
|
|
"""Git helper functions.
|
|
|
|
Everything here should be project agnostic: it shouldn't rely on project's
|
|
structure, or make assumptions about the passed arguments or calls' outcomes.
|
|
"""
|
|
|
|
import os
|
|
import re
|
|
import subprocess
|
|
import sys
|
|
|
|
|
|
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)
|
|
|
|
|
|
def am(repo, patch_data, threeway=False, directory=None, exclude=None,
|
|
committer_name=None, committer_email=None):
|
|
args = []
|
|
if threeway:
|
|
args += ['--3way']
|
|
if directory is not None:
|
|
args += ['--directory', directory]
|
|
if exclude is not None:
|
|
for path_pattern in exclude:
|
|
args += ['--exclude', path_pattern]
|
|
|
|
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]
|
|
root_args += ['-c', 'commit.gpgsign=false']
|
|
command = ['git'] + root_args + ['am'] + args
|
|
proc = subprocess.Popen(
|
|
command,
|
|
stdin=subprocess.PIPE)
|
|
proc.communicate(patch_data.encode('utf-8'))
|
|
if proc.returncode != 0:
|
|
raise RuntimeError("Command {} returned {}".format(command,
|
|
proc.returncode))
|
|
|
|
|
|
def apply_patch(repo, patch_path, directory=None, index=False, reverse=False):
|
|
args = ['git', '-C', repo, 'apply',
|
|
'--ignore-space-change',
|
|
'--ignore-whitespace',
|
|
'--whitespace', 'fix'
|
|
]
|
|
if directory:
|
|
args += ['--directory', directory]
|
|
if index:
|
|
args += ['--index']
|
|
if reverse:
|
|
args += ['--reverse']
|
|
args += ['--', patch_path]
|
|
|
|
return_code = subprocess.call(args)
|
|
applied_successfully = (return_code == 0)
|
|
return applied_successfully
|
|
|
|
|
|
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)
|
|
|
|
|
|
def get_patch(repo, commit_hash):
|
|
args = ['git', '-C', repo, 'diff-tree',
|
|
'-p',
|
|
commit_hash,
|
|
'--' # Explicitly tell Git `commit_hash` is a revision, not a path.
|
|
]
|
|
|
|
return subprocess.check_output(args)
|
|
|
|
|
|
def get_head_commit(repo):
|
|
args = ['git', '-C', repo, 'rev-parse', 'HEAD']
|
|
|
|
return subprocess.check_output(args).strip()
|
|
|
|
|
|
def update_ref(repo, ref, newvalue):
|
|
args = ['git', '-C', repo, 'update-ref', ref, newvalue]
|
|
|
|
return subprocess.check_call(args)
|
|
|
|
|
|
def reset(repo):
|
|
args = ['git', '-C', repo, 'reset']
|
|
|
|
subprocess.check_call(args)
|
|
|
|
|
|
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'
|
|
|
|
args = ['git', '-C', repo, 'commit',
|
|
'--author', author,
|
|
'--message', message
|
|
]
|
|
|
|
return_code = subprocess.call(args, env=env)
|
|
committed_successfully = (return_code == 0)
|
|
return committed_successfully
|
|
|
|
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.gitattributes'),
|
|
# 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: ')
|
|
|
|
|
|
def export_patches(repo, out_dir, patch_range=None, dry_run=False):
|
|
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
|
|
|
|
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
|
|
for patch in patches:
|
|
filename = get_file_name(patch)
|
|
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 in {} not up to date: {} patches need update\n".format(out_dir, 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')
|
|
|