diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -685,12 +685,6 @@ def rebase(ui, repo, **opts): # Validate input and define rebasing points destf = opts.get('dest', None) - - if ui.configbool('commands', 'rebase.requiredest'): - if not destf: - raise error.Abort(_('you must specify a destination'), - hint=_('use: hg rebase -d REV')) - srcf = opts.get('source', None) basef = opts.get('base', None) revf = opts.get('rev', []) @@ -776,6 +770,10 @@ def _definesets(ui, repo, destf=None, sr cmdutil.checkunfinished(repo) cmdutil.bailifchanged(repo) + if ui.configbool('commands', 'rebase.requiredest') and not destf: + raise error.Abort(_('you must specify a destination'), + hint=_('use: hg rebase -d REV')) + if destf: dest = scmutil.revsingle(repo, destf) diff --git a/tests/test-rebase-dest.t b/tests/test-rebase-dest.t --- a/tests/test-rebase-dest.t +++ b/tests/test-rebase-dest.t @@ -55,6 +55,5 @@ Requiring dest should not break continue (no more unresolved files) continue: hg rebase --continue $ hg rebase --continue - abort: you must specify a destination - (use: hg rebase -d REV) - [255] + rebasing 3:0537f6b50def "dc" (tip) + saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0537f6b50def-be4c7386-backup.hg (glob)