##// END OF EJS Templates
rebase: isolate command options from internal flags...
Yuya Nishihara -
r38519:02004e5c default
parent child Browse files
Show More
@@ -819,31 +819,31 b' def rebase(ui, repo, **opts):'
819 819 opts[r'dest'] = '_destautoorphanrebase(SRC)'
820 820
821 821 if dryrun:
822 return _dryrunrebase(ui, repo, **opts)
822 return _dryrunrebase(ui, repo, opts)
823 823 elif inmemory:
824 824 try:
825 825 # in-memory merge doesn't support conflicts, so if we hit any, abort
826 826 # and re-run as an on-disk merge.
827 827 overrides = {('rebase', 'singletransaction'): True}
828 828 with ui.configoverride(overrides, 'rebase'):
829 return _dorebase(ui, repo, inmemory=inmemory, **opts)
829 return _dorebase(ui, repo, opts, inmemory=inmemory)
830 830 except error.InMemoryMergeConflictsError:
831 831 ui.warn(_('hit merge conflicts; re-running rebase without in-memory'
832 832 ' merge\n'))
833 _dorebase(ui, repo, abort=True)
834 return _dorebase(ui, repo, inmemory=False, **opts)
833 _dorebase(ui, repo, {r'abort': True})
834 return _dorebase(ui, repo, opts, inmemory=False)
835 835 else:
836 return _dorebase(ui, repo, **opts)
836 return _dorebase(ui, repo, opts)
837 837
838 def _dryrunrebase(ui, repo, **opts):
838 def _dryrunrebase(ui, repo, opts):
839 839 rbsrt = rebaseruntime(repo, ui, inmemory=True,
840 840 opts=pycompat.byteskwargs(opts))
841 841 with repo.wlock(), repo.lock():
842 842 try:
843 843 overrides = {('rebase', 'singletransaction'): True}
844 844 with ui.configoverride(overrides, 'rebase'):
845 _origrebase(ui, repo, rbsrt, inmemory=True,
846 leaveunfinished=True, **opts)
845 _origrebase(ui, repo, opts, rbsrt, inmemory=True,
846 leaveunfinished=True)
847 847 except error.InMemoryMergeConflictsError:
848 848 ui.status(_('hit a merge conflict\n'))
849 849 return 1
@@ -855,11 +855,11 b' def _dryrunrebase(ui, repo, **opts):'
855 855 rbsrt._prepareabortorcontinue(isabort=True, backup=False,
856 856 suppwarns=True)
857 857
858 def _dorebase(ui, repo, inmemory=False, **opts):
858 def _dorebase(ui, repo, opts, inmemory=False):
859 859 rbsrt = rebaseruntime(repo, ui, inmemory, pycompat.byteskwargs(opts))
860 return _origrebase(ui, repo, rbsrt, inmemory=inmemory, **opts)
860 return _origrebase(ui, repo, opts, rbsrt, inmemory=inmemory)
861 861
862 def _origrebase(ui, repo, rbsrt, inmemory=False, leaveunfinished=False, **opts):
862 def _origrebase(ui, repo, opts, rbsrt, inmemory=False, leaveunfinished=False):
863 863 opts = pycompat.byteskwargs(opts)
864 864 with repo.wlock(), repo.lock():
865 865 # Validate input and define rebasing points
General Comments 0
You need to be logged in to leave comments. Login now