# HG changeset patch # User Augie Fackler # Date 1458408907 14400 # Node ID 6340c1a17845ae48756dd77b1cce18f8a62a1f02 # Parent 24d75bc4a3a1bbb8b5bdd91872e4fa7293f7e996# Parent 4276071d7cf34ac99533b658d9eb32921b2edc32 Merge. diff --git a/unixSoft/bin/hgimp b/unixSoft/bin/hgimp --- a/unixSoft/bin/hgimp +++ b/unixSoft/bin/hgimp @@ -16,6 +16,8 @@ def main(argv): p = argparse.ArgumentParser('import patches') p.add_argument('repo', type=str, nargs=1, help='repo name to apply patches to') + p.add_argument('--partial', action='store_true', + help='Commit partially-applied patches.') args = p.parse_args(argv[1:]) name, = args.repo if name in _MAP: @@ -33,8 +35,11 @@ def main(argv): name, ', '.join(c)) sys.exit(1) repo = _MAP[c[0]] - hg = subprocess.Popen(['hg', '-R', repo, 'import', '--obsolete', '-'], - stdin=subprocess.PIPE) + importargs = ['hg', '-R', repo, 'import', '--obsolete'] + if args.partial: + importargs.append('--partial') + importargs.append('-') + hg = subprocess.Popen(importargs, stdin=subprocess.PIPE) hg.stdin.write(sys.stdin.read()) hg.stdin.close() hg.wait()