Show More
@@ -593,7 +593,7 b' def tryimportone(ui, repo, hunk, parents' | |||||
593 | tmpname, message, user, date, branch, nodeid, p1, p2 = \ |
|
593 | tmpname, message, user, date, branch, nodeid, p1, p2 = \ | |
594 | patch.extract(ui, hunk) |
|
594 | patch.extract(ui, hunk) | |
595 |
|
595 | |||
596 | editor = getcommiteditor(**opts) |
|
596 | editor = getcommiteditor(editform='import.normal', **opts) | |
597 | update = not opts.get('bypass') |
|
597 | update = not opts.get('bypass') | |
598 | strip = opts["strip"] |
|
598 | strip = opts["strip"] | |
599 | sim = float(opts.get('similarity') or 0) |
|
599 | sim = float(opts.get('similarity') or 0) | |
@@ -687,12 +687,13 b' def tryimportone(ui, repo, hunk, parents' | |||||
687 | files, eolmode=None) |
|
687 | files, eolmode=None) | |
688 | except patch.PatchError, e: |
|
688 | except patch.PatchError, e: | |
689 | raise util.Abort(str(e)) |
|
689 | raise util.Abort(str(e)) | |
|
690 | editor = getcommiteditor(editform='import.bypass') | |||
690 | memctx = context.makememctx(repo, (p1.node(), p2.node()), |
|
691 | memctx = context.makememctx(repo, (p1.node(), p2.node()), | |
691 | message, |
|
692 | message, | |
692 | opts.get('user') or user, |
|
693 | opts.get('user') or user, | |
693 | opts.get('date') or date, |
|
694 | opts.get('date') or date, | |
694 | branch, files, store, |
|
695 | branch, files, store, | |
695 |
editor= |
|
696 | editor=editor) | |
696 | n = memctx.commit() |
|
697 | n = memctx.commit() | |
697 | finally: |
|
698 | finally: | |
698 | store.close() |
|
699 | store.close() |
General Comments 0
You need to be logged in to leave comments.
Login now