# HG changeset patch # User FUJIWARA Katsunori # Date 1399736975 -32400 # Node ID dcf20f244c2a8dd2e9c388ff0316709bcb02b933 # Parent ca275f7ec576ab20230244fa7de7fcda193ad9ea cmdutil: introduce "getcommiteditor()" to simplify code paths to choose editor "getcommiteditor()" can simplify code paths to choose commit editor according to '--edit' option as below: before: editor = cmdutil.commiteditor # or editor = None/False if opts.get('edit'): editor = cmdutil.commitforceeditor after: editor = cmdutil.getcommiteditor(**opts) "getcommiteditor()" accepts option arguments not in "opts" style but in "**opts" style, because some code paths want to invoke it with just explicit "edit=True" argument (building dictionary is redundant). diff -r ca275f7ec576 -r dcf20f244c2a mercurial/cmdutil.py --- a/mercurial/cmdutil.py Wed May 14 12:49:55 2014 -0700 +++ b/mercurial/cmdutil.py Sun May 11 00:49:35 2014 +0900 @@ -109,6 +109,13 @@ (logfile, inst.strerror)) return message +def getcommiteditor(edit=False, **opts): + """get appropriate commit message editor according to '--edit' option""" + if edit: + return commitforceeditor + else: + return commiteditor + def loglimit(opts): """get the log limit according to option -l/--limit""" limit = opts.get('limit')