##// END OF EJS Templates
rebase: allow destination-free continue and abort (issue5513)
Ryan McElroy -
r31731:b5afec71 default
parent child Browse files
Show More
@@ -685,12 +685,6 b' def rebase(ui, repo, **opts):'
685
685
686 # Validate input and define rebasing points
686 # Validate input and define rebasing points
687 destf = opts.get('dest', None)
687 destf = opts.get('dest', None)
688
689 if ui.configbool('commands', 'rebase.requiredest'):
690 if not destf:
691 raise error.Abort(_('you must specify a destination'),
692 hint=_('use: hg rebase -d REV'))
693
694 srcf = opts.get('source', None)
688 srcf = opts.get('source', None)
695 basef = opts.get('base', None)
689 basef = opts.get('base', None)
696 revf = opts.get('rev', [])
690 revf = opts.get('rev', [])
@@ -776,6 +770,10 b' def _definesets(ui, repo, destf=None, sr'
776 cmdutil.checkunfinished(repo)
770 cmdutil.checkunfinished(repo)
777 cmdutil.bailifchanged(repo)
771 cmdutil.bailifchanged(repo)
778
772
773 if ui.configbool('commands', 'rebase.requiredest') and not destf:
774 raise error.Abort(_('you must specify a destination'),
775 hint=_('use: hg rebase -d REV'))
776
779 if destf:
777 if destf:
780 dest = scmutil.revsingle(repo, destf)
778 dest = scmutil.revsingle(repo, destf)
781
779
@@ -55,6 +55,5 b' Requiring dest should not break continue'
55 (no more unresolved files)
55 (no more unresolved files)
56 continue: hg rebase --continue
56 continue: hg rebase --continue
57 $ hg rebase --continue
57 $ hg rebase --continue
58 abort: you must specify a destination
58 rebasing 3:0537f6b50def "dc" (tip)
59 (use: hg rebase -d REV)
59 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0537f6b50def-be4c7386-backup.hg (glob)
60 [255]
General Comments 0
You need to be logged in to leave comments. Login now