Mercurial > hg-stable
changeset 31736:b5afec71c1f9
rebase: allow destination-free continue and abort (issue5513)
| author | Ryan McElroy <rmcelroy@fb.com> |
|---|---|
| date | Thu, 30 Mar 2017 03:50:10 -0700 |
| parents | 6931c3346551 |
| children | 9ddf875183b0 |
| files | hgext/rebase.py tests/test-rebase-dest.t |
| diffstat | 2 files changed, 6 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Thu Mar 30 03:50:10 2017 -0700 +++ b/hgext/rebase.py Thu Mar 30 03:50:10 2017 -0700 @@ -685,12 +685,6 @@ # 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 @@ 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)
--- a/tests/test-rebase-dest.t Thu Mar 30 03:50:10 2017 -0700 +++ b/tests/test-rebase-dest.t Thu Mar 30 03:50:10 2017 -0700 @@ -55,6 +55,5 @@ (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)