chore: deprecate apply-patches in favour of git-{import,export}-patches (#15300)
This commit is contained in:
parent
4185efa08f
commit
335e9f68b7
123 changed files with 4368 additions and 4780 deletions
28
script/git-import-patches
Executable file
28
script/git-import-patches
Executable file
|
@ -0,0 +1,28 @@
|
|||
#!/usr/bin/env python
|
||||
|
||||
import argparse
|
||||
import os
|
||||
import sys
|
||||
|
||||
from lib import git
|
||||
from lib.patches import patch_from_dir
|
||||
|
||||
|
||||
def main(argv):
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("patch_dir",
|
||||
help="directory containing patches to apply")
|
||||
parser.add_argument("-3", "--3way",
|
||||
action="store_true", dest='threeway',
|
||||
help="use 3-way merge to resolve conflicts")
|
||||
args = parser.parse_args(argv)
|
||||
|
||||
git.am(
|
||||
repo='.',
|
||||
patch_data=patch_from_dir(args.patch_dir),
|
||||
threeway=args.threeway
|
||||
)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main(sys.argv[1:])
|
Loading…
Add table
Add a link
Reference in a new issue