Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-03 03:01:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[upstream_utils] Apply "git am" patches individually (#4250)

Browse Source 
Also, giving am_patches() zero patches isn't an error. The function will
just be a no-op.
This commit is contained in:
Tyler Veness
2022-05-18 12:22:31 -07:00
committed by GitHub
parent 6a4752dcdc
commit 4253d6d5f0
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
upstream_utils/upstream_utils.py
View File

@@ -192,7 +192,8 @@ def comment_out_invalid_includes(filename, include_roots):
def apply_patches(root, patches):
"""Apply list of patches to the destination Git repository.
"""Apply list of patches to the destination Git repository using "git
apply".
Keyword arguments:
root -- the root directory of the destination Git repository
@@ -204,21 +205,16 @@ def apply_patches(root, patches):
def am_patches(root, patches, use_threeway=False):
"""Apply list of patches to the destination Git repository.
"""Apply list of patches to the destination Git repository using "git am".
Keyword arguments:
root -- the root directory of the destination Git repository
patches -- list of patch files relative to the root
"""
if len(patches) == 0:
raise Exception("Must provide at least one patch")
os.chdir(root)
args = ["git", "am"]
if use_threeway:
args.append("-3")
for patch in patches:
args.append(patch)
subprocess.check_output(args)
subprocess.check_output(args + [patch])