Mercurial > public > mercurial-scm > hg

diff tests/test-commit-amend.t @ 21036:a1a1bd09e4f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
amend: invoke editor forcibly when "--edit" option is specified 422981492ace introduces "--edit" option into "hg commit", but it doesn't work for "hg commit --amend", because 422981492ace prepares for editor invocation only around "commitfunc()" internal function, which is used only for temporary amend commit by "cmdutil.amend()". Actual commit message editing is executed in "cmdutil.amend()". This patch invokes editor forcibly when "--edit" option is specified for "hg commit --amend", even if commit message is specified explicitly by "--message" or "--logfile". This patch also removes useless handling for commit message and editor invocation around "commitfunc()" internal function.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Wed, 16 Apr 2014 02:38:11 +0900
parents 434619dae569
children 19d6fec60b81
line wrap: on
line diff
--- a/tests/test-commit-amend.t	Wed Apr 16 02:04:41 2014 +0900
+++ b/tests/test-commit-amend.t	Wed Apr 16 02:38:11 2014 +0900
@@ -827,3 +827,25 @@
   $ hg phase '.^::.'
   35: draft
   38: secret
+
+Test that amend with --edit invokes editor forcibly
+---------------------------------------------------
+
+  $ hg parents --template "{desc}\n"
+  amend as secret
+  $ HGEDITOR=cat hg commit --amend -m "editor should be suppressed"
+  $ hg parents --template "{desc}\n"
+  editor should be suppressed
+
+  $ HGEDITOR=cat hg commit --amend -m "editor should be invoked" --edit
+  editor should be invoked
+  
+  
+  HG: Enter commit message.  Lines beginning with 'HG:' are removed.
+  HG: Leave message empty to abort commit.
+  HG: --
+  HG: user: test
+  HG: branch 'silliness'
+  HG: changed obs.py
+  $ hg parents --template "{desc}\n"
+  editor should be invoked