changeset 392:6340c1a17845

Merge.
author Augie Fackler <raf@durin42.com>
date Sat, 19 Mar 2016 13:35:07 -0400
parents 24d75bc4a3a1 (diff) 4276071d7cf3 (current diff)
children 08755f0a9f1f
files
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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()