Show More
@@ -69,6 +69,7 b' def _makeextrafn(copiers):' | |||||
69 | ('', 'keep', False, _('keep original changesets')), |
|
69 | ('', 'keep', False, _('keep original changesets')), | |
70 | ('', 'keepbranches', False, _('keep original branch names')), |
|
70 | ('', 'keepbranches', False, _('keep original branch names')), | |
71 | ('D', 'detach', False, _('(DEPRECATED)')), |
|
71 | ('D', 'detach', False, _('(DEPRECATED)')), | |
|
72 | ('i', 'interactive', False, _('(DEPRECATED)')), | |||
72 | ('t', 'tool', '', _('specify merge tool')), |
|
73 | ('t', 'tool', '', _('specify merge tool')), | |
73 | ('c', 'continue', False, _('continue an interrupted rebase')), |
|
74 | ('c', 'continue', False, _('continue an interrupted rebase')), | |
74 | ('a', 'abort', False, _('abort an interrupted rebase'))] + |
|
75 | ('a', 'abort', False, _('abort an interrupted rebase'))] + | |
@@ -163,6 +164,11 b' def rebase(ui, repo, **opts):' | |||||
163 | # other extensions |
|
164 | # other extensions | |
164 | keepopen = opts.get('keepopen', False) |
|
165 | keepopen = opts.get('keepopen', False) | |
165 |
|
166 | |||
|
167 | if opts.get('interactive'): | |||
|
168 | msg = _("interactive history editing is supported by the " | |||
|
169 | "'histedit' extension (see 'hg help histedit')") | |||
|
170 | raise util.Abort(msg) | |||
|
171 | ||||
166 | if collapsemsg and not collapsef: |
|
172 | if collapsemsg and not collapsef: | |
167 | raise util.Abort( |
|
173 | raise util.Abort( | |
168 | _('message can only be specified with collapse')) |
|
174 | _('message can only be specified with collapse')) |
@@ -459,4 +459,12 b' Test --tool parameter:' | |||||
459 | tool option will be ignored |
|
459 | tool option will be ignored | |
460 | saved backup bundle to $TESTTMP/b3/.hg/strip-backup/*-backup.hg (glob) |
|
460 | saved backup bundle to $TESTTMP/b3/.hg/strip-backup/*-backup.hg (glob) | |
461 |
|
461 | |||
|
462 | $ hg rebase -i | |||
|
463 | abort: interactive history editing is supported by the 'histedit' extension (see 'hg help histedit') | |||
|
464 | [255] | |||
|
465 | ||||
|
466 | $ hg rebase --interactive | |||
|
467 | abort: interactive history editing is supported by the 'histedit' extension (see 'hg help histedit') | |||
|
468 | [255] | |||
|
469 | ||||
462 | $ cd .. |
|
470 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now