import: pass 'editform' argument to 'cmdutil.getcommiteditor'
This patch passes 'editform' argument according to the format below:
COMMAND[.ROUTE]
- ROUTE: name of route, if there are two or more routes in COMMAND
In this patch, 'normal' and 'bypass' are used as ROUTE.
--- a/mercurial/cmdutil.py Sat Aug 02 21:46:27 2014 +0900
+++ b/mercurial/cmdutil.py Sat Aug 02 21:46:27 2014 +0900
@@ -593,7 +593,7 @@
tmpname, message, user, date, branch, nodeid, p1, p2 = \
patch.extract(ui, hunk)
- editor = getcommiteditor(**opts)
+ editor = getcommiteditor(editform='import.normal', **opts)
update = not opts.get('bypass')
strip = opts["strip"]
sim = float(opts.get('similarity') or 0)
@@ -687,12 +687,13 @@
files, eolmode=None)
except patch.PatchError, e:
raise util.Abort(str(e))
+ editor = getcommiteditor(editform='import.bypass')
memctx = context.makememctx(repo, (p1.node(), p2.node()),
message,
opts.get('user') or user,
opts.get('date') or date,
branch, files, store,
- editor=getcommiteditor())
+ editor=editor)
n = memctx.commit()
finally:
store.close()