equal
deleted
inserted
replaced
683 wlock = repo.wlock() |
683 wlock = repo.wlock() |
684 lock = repo.lock() |
684 lock = repo.lock() |
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', []) |
697 # search default destination in this space |
691 # search default destination in this space |
698 # used in the 'hg pull --rebase' case, see issue 5214. |
692 # used in the 'hg pull --rebase' case, see issue 5214. |
773 if revf and srcf: |
767 if revf and srcf: |
774 raise error.Abort(_('cannot specify both a revision and a source')) |
768 raise error.Abort(_('cannot specify both a revision and a source')) |
775 |
769 |
776 cmdutil.checkunfinished(repo) |
770 cmdutil.checkunfinished(repo) |
777 cmdutil.bailifchanged(repo) |
771 cmdutil.bailifchanged(repo) |
|
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')) |
778 |
776 |
779 if destf: |
777 if destf: |
780 dest = scmutil.revsingle(repo, destf) |
778 dest = scmutil.revsingle(repo, destf) |
781 |
779 |
782 if revf: |
780 if revf: |