# HG changeset patch # User David Soria Parra <davidsp@fb.com> # Date 1409564935 -7200 # Mon Sep 01 11:48:55 2014 +0200 # Node ID d5b04ee8ecf751c1f75a1e45f066a41ce4ffc14b # Parent 392ae5cb8d62b8c2f26346a4977170211adb3822 rebase: add a deprecated -i/--interactive flag A common mistake can be to type 'hg rebase -i' to discover interactive history editing. We add a -i/--interactive flag as discussed in the sprint and deprecate it right away, but hint people using it to use histedit instead. diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -69,6 +69,7 @@ ('', 'keep', False, _('keep original changesets')), ('', 'keepbranches', False, _('keep original branch names')), ('D', 'detach', False, _('(DEPRECATED)')), + ('i', 'interactive', False, _('(DEPRECATED)')), ('t', 'tool', '', _('specify merge tool')), ('c', 'continue', False, _('continue an interrupted rebase')), ('a', 'abort', False, _('abort an interrupted rebase'))] + @@ -163,6 +164,11 @@ # other extensions keepopen = opts.get('keepopen', False) + if opts.get('interactive'): + msg = _("interactive history editing is supported by the " + "'histedit' extension (see 'hg help histedit')") + raise util.Abort(msg) + if collapsemsg and not collapsef: raise util.Abort( _('message can only be specified with collapse')) diff --git a/tests/test-rebase-parameters.t b/tests/test-rebase-parameters.t --- a/tests/test-rebase-parameters.t +++ b/tests/test-rebase-parameters.t @@ -459,4 +459,12 @@ tool option will be ignored saved backup bundle to $TESTTMP/b3/.hg/strip-backup/*-backup.hg (glob) + $ hg rebase -i + abort: interactive history editing is supported by the 'histedit' extension (see 'hg help histedit') + [255] + + $ hg rebase --interactive + abort: interactive history editing is supported by the 'histedit' extension (see 'hg help histedit') + [255] + $ cd ..