diff --git a/hgext/fetch.py b/hgext/fetch.py index bab6c8f2bb1a545fbfdf1c14bdc04780a23ea11a_aGdleHQvZmV0Y2gucHk=..595a69a011297c249e819e673298c57c78412c51_aGdleHQvZmV0Y2gucHk= 100644 --- a/hgext/fetch.py +++ b/hgext/fetch.py @@ -65,5 +65,6 @@ message = (cmdutil.logmessage(opts) or (_('Automated merge with %s') % util.removeauth(other.url()))) + force_editor = opts.get('force_editor') or opts.get('edit') n = repo.commit(mod + add + rem, message, opts['user'], opts['date'], @@ -68,6 +69,6 @@ n = repo.commit(mod + add + rem, message, opts['user'], opts['date'], - force_editor=opts.get('force_editor')) + force_editor=force_editor) ui.status(_('new changeset %d:%s merges remote changes ' 'with local\n') % (repo.changelog.rev(n), short(n))) @@ -116,7 +117,8 @@ 'fetch': (fetch, [('r', 'rev', [], _('a specific revision you would like to pull')), - ('f', 'force-editor', None, _('edit commit message')), + ('e', 'edit', None, _('edit commit message')), + ('', 'force-editor', None, _('edit commit message (DEPRECATED)')), ('', 'switch-parent', None, _('switch parents when merging')), ] + commands.commitopts + commands.commitopts2 + commands.remoteopts, _('hg fetch [SOURCE]')),