# HG changeset patch # User FUJIWARA Katsunori # Date 1406983586 -32400 # Node ID 20fd00ee432e16965bfb97a2fcfbed8134d4352a # Parent 6ce282ed801e5f2c482749d5f2af182ddffcd785 fetch: 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 and ROUTE are omitted. diff -r 6ce282ed801e -r 20fd00ee432e hgext/fetch.py --- a/hgext/fetch.py Sat Aug 02 21:46:26 2014 +0900 +++ b/hgext/fetch.py Sat Aug 02 21:46:26 2014 +0900 @@ -143,8 +143,8 @@ ('Automated merge with %s' % util.removeauth(other.url()))) editopt = opts.get('edit') or opts.get('force_editor') - n = repo.commit(message, opts['user'], opts['date'], - editor=cmdutil.getcommiteditor(edit=editopt)) + editor = cmdutil.getcommiteditor(edit=editopt, editform='fetch') + n = repo.commit(message, opts['user'], opts['date'], editor=editor) ui.status(_('new changeset %d:%s merges remote changes ' 'with local\n') % (repo.changelog.rev(n), short(n)))