483808a8cf
* script: Python3 compatibility for utf8 conversion The unicode() method has been renamed to str() in Python3, add a wrapper around it to support running against both versions. * script: don't require python2 for git-[import,export]-patches The scripts work just fine with python3 too, so use the generic python executable as the script interpreter. Most setups don't even require or provide python 2 anymore, so this saves one from having to install it just for the scripts.
27 lines
589 B
Python
Executable file
27 lines
589 B
Python
Executable file
#!/usr/bin/env python
|
|
|
|
import argparse
|
|
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.import_patches(
|
|
repo='.',
|
|
patch_data=patch_from_dir(args.patch_dir),
|
|
threeway=args.threeway
|
|
)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
main(sys.argv[1:])
|