diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-28 16:04:54 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-28 16:04:54 +0000 |
commit | 96c1e43cb850d7afa4730a8c3bafa58913607996 (patch) | |
tree | b0522edde1d3c5356c95eb1ee2eae3e87befa1f3 /llvm_tools/get_upstream_patch.py | |
parent | 9d023268dcf468f9d4bbd874545c9c230e7549b3 (diff) | |
parent | 178e686da38f18bbc35b0f1903c93effa94bc6b4 (diff) | |
download | toolchain-utils-96c1e43cb850d7afa4730a8c3bafa58913607996.tar.gz |
Snap for 8512216 from 178e686da38f18bbc35b0f1903c93effa94bc6b4 to tm-frc-adbd-releaset_frc_adb_330444000android13-frc-adbd-release
Change-Id: I0ac731a212526a83e17c15bfdabe72391ee9d855
Diffstat (limited to 'llvm_tools/get_upstream_patch.py')
-rwxr-xr-x | llvm_tools/get_upstream_patch.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/llvm_tools/get_upstream_patch.py b/llvm_tools/get_upstream_patch.py index 7a4be3eb..5669b023 100755 --- a/llvm_tools/get_upstream_patch.py +++ b/llvm_tools/get_upstream_patch.py @@ -96,15 +96,18 @@ def add_patch(patches_json_path: str, patches_dir: str, cwd=llvm_dir, encoding='utf-8') + end_vers = rev.number if isinstance(rev, git_llvm_rev.Rev) else None patch_props = { 'rel_patch_path': rel_patch_path, - 'start_version': start_version.number, 'metadata': { 'title': commit_subject.strip(), 'info': [], }, 'platforms': sorted(platforms), - 'end_version': rev.number if isinstance(rev, git_llvm_rev.Rev) else None, + 'version_range': { + 'from': start_version.number, + 'until': end_vers, + }, } patches_json.append(patch_props) @@ -346,8 +349,8 @@ def _convert_patch(llvm_config: git_llvm_rev.LLVMConfig, is_differential=is_differential) -def _get_duplicate_shas( - patches: t.List[ParsedPatch]) -> t.List[t.Tuple[ParsedPatch, ParsedPatch]]: +def _get_duplicate_shas(patches: t.List[ParsedPatch] + ) -> t.List[t.Tuple[ParsedPatch, ParsedPatch]]: """Return a list of Patches which have duplicate SHA's""" return [(left, right) for i, left in enumerate(patches) for right in patches[i + 1:] if left.sha == right.sha] |