--- a/hgext/fetch.py Sun Mar 09 17:34:55 2008 +0000
+++ b/hgext/fetch.py Tue Mar 11 11:30:42 2008 -0700
@@ -65,9 +65,10 @@
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'],
- 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]')),