FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:36 +0900] rev 21422
mq: fold the code paths to invoke editor into specific logic (qrefresh/qfold)
This factoring simplifies the succeeding patch to switch from
"ui.edit()" to "getcommiteditor()" for qrefresh/qfold.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:36 +0900] rev 21421
mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qnew)
This patch also replaces "editor = False" by "editor =
cmdutil.getcommiteditor()", because:
- the latter allows to hook commit message determination easily,
even in the case without "--edit"
- the latter can avoid regression (or additional care) around saving
"last-message.txt", even if MQ's "newcommit()" changes its
implementation logic from "localrepository.commit" to
"localrepository.commitctx" with "memctx" in the future
to save commit message into "last-messge.txt" with "memctx",
"editor" should be valid function.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:36 +0900] rev 21420
mq: fold the code path to invoke editor into specific logic (qnew)
This factoring simplifies the succeeding patch to switch from
"ui.edit()" to "getcommiteditor()" for qnew.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:36 +0900] rev 21419
cmdutil: enhance "getcommiteditor()" for specific usages in MQ
This patch introduces "finishdesc" and "extramsg" arguments into
"getcommiteditor()" for specific usages in MQ.
"finishdesc" will be used to treat the commit message as "[mq];
patch-file-name" (default MQ commit message), if it is left as empty,
instead of aborting commit process.
"extramsg" will be used to show the line below:
HG: Leave message empty to use default message
instead of:
HG: Leave message empty to abort commit
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:36 +0900] rev 21418
tag: use the editor gotten by "getcommiteditor()" instead of "ui.edit()"
This patch also enhances "test-tag.t", because "hg tag" hasn't been
explicitly tested around editor invocation and "--edit" option.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:36 +0900] rev 21417
import: use "getcommiteditor()" instead of explicit editor choice
This patch also enhances "test-import-bypass.t" and "test-import.t",
because "hg import" hasn't been explicitly tested around editor
invocation and "--edit" option.
This patch explicitly tests below:
- with "--bypass" (regardless of "--edit"):
- not invoked, if the patch contains the commit message
- not invoked, if the commit message is explicitly specified
- invoked, otherwise (just adding comment)
- without "--bypass":
- with "--edit":
- not invoked, if "--no-commit" is not specified
- invoked, otherwise
- without "--edit":
- not invoked, if the patch contains the commit message
- not invoked, if "--message" or "--logfile" is specified
(just adding comment)
- invoked, otherwise
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:36 +0900] rev 21416
graft: use "getcommiteditor()" instead of explicit editor choice
This patch also enhances "test-graft.t", because "hg graft" hasn't
been explicitly tested around editor invocation and "--edit" option.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:36 +0900] rev 21415
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".
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:36 +0900] rev 21414
commit: use "getcommiteditor()" instead of explicit editor choice
This patch also eliminates "forceeditor" no more referred.
This patch doesn't change any tests like as preceding patches, because
editor invocation is already tested well.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:36 +0900] rev 21413
backout: use "getcommiteditor()" instead of explicit editor choice
This patch also enhances "test-backout.t", because "hg backout" hasn't
been explicitly tested around editor invocation and '--edit' option.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:35 +0900] rev 21412
backout: avoid redundant message examination
Before this patch, "hg backout" examines "--message" and "--logfile"
options explicitly.
But this examination is redundant, because "commitfunc()" can receive
the result of same examination by "cmdutil.logmessage()" in
"cmdutil.commit()" through "message" argument.
This patch avoids redundant message examination by "message"
examination in "commitfunc()".
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:35 +0900] rev 21411
transplant: use "getcommiteditor()" instead of explicit editor choice
This patch also enhances "test-transplant.t", because "hg transplant"
hasn't been explicitly tested around editor invocation and "--edit"
option.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:35 +0900] rev 21410
rebase: use "getcommiteditor()" instead of explicit editor choice
This patch also enhances "test-rebase-scenario-global.t", because "hg
rebase" hasn't been explicitly tested around editor invocation and
"--edit" option.
In the other hand, this patch doesn't enhance tests in "hg rebase
--collapse" case, because it is already tested in
"test-rebase-collapse.t".
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:35 +0900] rev 21409
histedit: use "getcommiteditor()" instead of explicit editor choice for "--continue"
This omits (redundant) adding "\n' to "message", because:
- empty line is inserted by "commitforceeditor", if editor is invoked
- tail white-spaces are stripped at storing into chaneglog, otherwise
This patch also enhances "test-histedit-edit.t", because "hg histedit"
hasn't been explicitly tested around editor invocation and
"--continue" option.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:35 +0900] rev 21408
histedit: use "getcommiteditor()" instead of explicit editor choice for "fold"
This patch doesn't change any tests like as preceding patches, because
editor invocation is already tested in "test-histedit-fold.t".
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 11 May 2014 00:49:35 +0900] rev 21407
histedit: use the editor gotten by "getcommiteditor()" for "message"
Before this patch, "hg histedit" for "message" uses "ui.edit()" for
commit message editing.
It shows original commit message, but not detail about the target
revision: status of each modified/added/removed files, for example.
This patch uses the editor gotten by "getcommiteditor()" instead of
"ui.edit()" for "message"
In "test-histedit-edit.t", this patch omits "fixbundle" invocation,
because it prevents from confirming the "HG: added f" line in commit
message by filtering " added " lines.
Omiting "fixbundle" invocation causes that the exit code of "hg
histedit" appears as one of command line: in this case, "hg histedit"
is aborted by (expected) exception raising.