Show More
@@ -65,9 +65,10 b" def fetch(ui, repo, source='default', **" | |||||
65 | message = (cmdutil.logmessage(opts) or |
|
65 | message = (cmdutil.logmessage(opts) or | |
66 | (_('Automated merge with %s') % |
|
66 | (_('Automated merge with %s') % | |
67 | util.removeauth(other.url()))) |
|
67 | util.removeauth(other.url()))) | |
|
68 | force_editor = opts.get('force_editor') or opts.get('edit') | |||
68 | n = repo.commit(mod + add + rem, message, |
|
69 | n = repo.commit(mod + add + rem, message, | |
69 | opts['user'], opts['date'], |
|
70 | opts['user'], opts['date'], | |
70 |
force_editor= |
|
71 | force_editor=force_editor) | |
71 | ui.status(_('new changeset %d:%s merges remote changes ' |
|
72 | ui.status(_('new changeset %d:%s merges remote changes ' | |
72 | 'with local\n') % (repo.changelog.rev(n), |
|
73 | 'with local\n') % (repo.changelog.rev(n), | |
73 | short(n))) |
|
74 | short(n))) | |
@@ -116,7 +117,8 b' cmdtable = {' | |||||
116 | 'fetch': |
|
117 | 'fetch': | |
117 | (fetch, |
|
118 | (fetch, | |
118 | [('r', 'rev', [], _('a specific revision you would like to pull')), |
|
119 | [('r', 'rev', [], _('a specific revision you would like to pull')), | |
119 |
(' |
|
120 | ('e', 'edit', None, _('edit commit message')), | |
|
121 | ('', 'force-editor', None, _('edit commit message (DEPRECATED)')), | |||
120 | ('', 'switch-parent', None, _('switch parents when merging')), |
|
122 | ('', 'switch-parent', None, _('switch parents when merging')), | |
121 | ] + commands.commitopts + commands.commitopts2 + commands.remoteopts, |
|
123 | ] + commands.commitopts + commands.commitopts2 + commands.remoteopts, | |
122 | _('hg fetch [SOURCE]')), |
|
124 | _('hg fetch [SOURCE]')), |
General Comments 0
You need to be logged in to leave comments.
Login now