Patchwork [1,of,2] commit: abolish useless "--force-editor" internal option for "hg commit"

login
register
mail settings
Submitter Katsunori FUJIWARA
Date April 15, 2014, 5:39 p.m.
Message ID <b643fd82568ffc69a7d2.1397583544@feefifofum>
Download mbox | patch
Permalink /patch/4373/
State Accepted
Commit e6e34c17b1ccff02fdad0c99c22f82c32c6daa1f
Headers show

Comments

Katsunori FUJIWARA - April 15, 2014, 5:39 p.m.
# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1397581481 -32400
#      Wed Apr 16 02:04:41 2014 +0900
# Node ID b643fd82568ffc69a7d2ce711eb6e9174556cf9b
# Parent  76f68595ff8e5616a79dd79e962a97cc9ba58713
commit: abolish useless "--force-editor" internal option for "hg commit"

"--force-editor" option for "hg commit" has been useless since
12721a20ed30, which makes "commands.tag()" invoke "cmdutil.commit()"
directly instead of "commands.commit()" with "--force-editor" internal
option.

This patch abolishes useless "--force-editor" internal option for "hg
commit".
Katsunori FUJIWARA - April 15, 2014, 5:44 p.m.
At Wed, 16 Apr 2014 02:39:04 +0900,
FUJIWARA Katsunori wrote:
> 
> # HG changeset patch
> # User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
> # Date 1397581481 -32400
> #      Wed Apr 16 02:04:41 2014 +0900
> # Node ID b643fd82568ffc69a7d2ce711eb6e9174556cf9b
> # Parent  76f68595ff8e5616a79dd79e962a97cc9ba58713
> commit: abolish useless "--force-editor" internal option for "hg commit"
> 
> "--force-editor" option for "hg commit" has been useless since
> 12721a20ed30, which makes "commands.tag()" invoke "cmdutil.commit()"
> directly instead of "commands.commit()" with "--force-editor" internal
> option.
> 
> This patch abolishes useless "--force-editor" internal option for "hg
> commit".

I made this patch precede next patch (#2) to clarify that patch #2
doesn't have to care for "--force-editor" option.

----------------------------------------------------------------------
[FUJIWARA Katsunori]                             foozy@lares.dti.ne.jp

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1364,7 +1364,7 @@ 
 
     Returns 0 on success, 1 if nothing changed.
     """
-    forceeditor = opts.get('force_editor') or opts.get('edit')
+    forceeditor = opts.get('edit')
 
     if opts.get('subrepos'):
         if opts.get('amend'):