923 ('', 'edit-plan', False, _('edit remaining actions list')), |
923 ('', 'edit-plan', False, _('edit remaining actions list')), |
924 ('k', 'keep', False, |
924 ('k', 'keep', False, |
925 _("don't strip old nodes after edit is complete")), |
925 _("don't strip old nodes after edit is complete")), |
926 ('', 'abort', False, _('abort an edit in progress')), |
926 ('', 'abort', False, _('abort an edit in progress')), |
927 ('o', 'outgoing', False, _('changesets not found in destination')), |
927 ('o', 'outgoing', False, _('changesets not found in destination')), |
928 ('', 'no-backup', False, _('do not save backup copies of files')), |
|
929 ('f', 'force', False, |
928 ('f', 'force', False, |
930 _('force outgoing even for unrelated repositories')), |
929 _('force outgoing even for unrelated repositories')), |
931 ('r', 'rev', [], _('first revision to be edited'), _('REV'))] + |
930 ('r', 'rev', [], _('first revision to be edited'), _('REV'))] + |
932 cmdutil.formatteropts, |
931 cmdutil.formatteropts, |
933 _("[OPTIONS] ([ANCESTOR] | --outgoing [URL])")) |
932 _("[OPTIONS] ([ANCESTOR] | --outgoing [URL])")) |
1110 fm = ui.formatter('histedit', opts) |
1109 fm = ui.formatter('histedit', opts) |
1111 fm.startitem() |
1110 fm.startitem() |
1112 goal = _getgoal(opts) |
1111 goal = _getgoal(opts) |
1113 revs = opts.get('rev', []) |
1112 revs = opts.get('rev', []) |
1114 # experimental config: ui.history-editing-backup |
1113 # experimental config: ui.history-editing-backup |
1115 nobackup = (opts.get('no_backup') or |
1114 nobackup = not ui.configbool('ui', 'history-editing-backup') |
1116 not ui.configbool('ui', 'history-editing-backup')) |
|
1117 rules = opts.get('commands', '') |
1115 rules = opts.get('commands', '') |
1118 state.keep = opts.get('keep', False) |
1116 state.keep = opts.get('keep', False) |
1119 |
1117 |
1120 _validateargs(ui, repo, state, freeargs, opts, goal, rules, revs) |
1118 _validateargs(ui, repo, state, freeargs, opts, goal, rules, revs) |
1121 |
1119 |