--- a/mercurial/commands.py	Sat Aug 02 21:46:27 2014 +0900
+++ b/mercurial/commands.py	Sat Aug 02 21:46:27 2014 +0900
@@ -1449,9 +1449,11 @@
                     repo.baseui.setconfig('phases', 'new-commit', 'secret',
                                           'commit')
 
+                editform = 'commit.normal'
+                editor = cmdutil.getcommiteditor(editform=editform, **opts)
                 return repo.commit(message, opts.get('user'), opts.get('date'),
                                    match,
-                                   editor=cmdutil.getcommiteditor(**opts),
+                                   editor=editor,
                                    extra=extra)
             finally:
                 ui.setconfig('phases', 'new-commit', oldcommitphase, 'commit')