# HG changeset patch # User FUJIWARA Katsunori # Date 1406983586 -32400 # Node ID 3646716b11a7d617039dfc8b6acbbebd0519bdbd # Parent cbbd957358ff618751f2fe92bc9b06a7293247db rebase: pass 'editform' argument to 'cmdutil.getcommiteditor' This patch passes 'editform' argument according to the format below: EXTENSION[.COMMAND][.ROUTE] - EXTENSION: name of extension - COMMAND: name of command, if there are two or more commands in EXTENSION - ROUTE: name of route, if there are two or more routes in COMMAND In this patch: - COMMAND is omitted - 'normal' and 'collapse' are used as ROUTE diff -r cbbd957358ff -r 3646716b11a7 hgext/rebase.py --- a/hgext/rebase.py Sat Aug 02 21:46:26 2014 +0900 +++ b/hgext/rebase.py Sat Aug 02 21:46:26 2014 +0900 @@ -138,7 +138,7 @@ skipped = set() targetancestors = set() - editor = cmdutil.getcommiteditor(**opts) + editor = cmdutil.getcommiteditor(editform='rebase.normal', **opts) lock = wlock = None try: @@ -383,7 +383,8 @@ for rebased in state: if rebased not in skipped and state[rebased] > nullmerge: commitmsg += '\n* %s' % repo[rebased].description() - editor = cmdutil.getcommiteditor(edit=True) + editform = 'rebase.collapse' + editor = cmdutil.getcommiteditor(edit=True, editform=editform) newrev = concludenode(repo, rev, p1, external, commitmsg=commitmsg, extrafn=extrafn, editor=editor) for oldrev in state.iterkeys():