# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1399736976 -32400
# Node ID 0b5d6c062774d7be2e3369888f75e6976c66d645
# Parent  37a302f0e2970a7a764e2ac02710ee5574d0b45a
amend: use "getcommiteditor()" instead of explicit editor choice

This patch doesn't change any tests like as preceding patches, because
editor invocation is already tested in "test-commit-amend.t".

diff -r 37a302f0e297 -r 0b5d6c062774 mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Sun May 11 00:49:36 2014 +0900
+++ b/mercurial/cmdutil.py	Sun May 11 00:49:36 2014 +0900
@@ -2051,12 +2051,10 @@
 
                 user = opts.get('user') or old.user()
                 date = opts.get('date') or old.date()
-            editor = commiteditor
+            editor = getcommiteditor(**opts)
             if not message:
-                editor = commitforceeditor
+                editor = getcommiteditor(edit=True)
                 message = old.description()
-            elif opts.get('edit'):
-                editor = commitforceeditor
 
             pureextra = extra.copy()
             extra['amend_source'] = old.hex()