Show More
@@ -840,8 +840,8 b' def _origrebase(ui, repo, inmemory=False' | |||||
840 | if retcode is not None: |
|
840 | if retcode is not None: | |
841 | return retcode |
|
841 | return retcode | |
842 | else: |
|
842 | else: | |
843 |
destmap = _definedestmap(ui, repo, |
|
843 | destmap = _definedestmap(ui, repo, inmemory, destf, srcf, basef, | |
844 | destspace=destspace) |
|
844 | revf, destspace=destspace) | |
845 | retcode = rbsrt._preparenewrebase(destmap) |
|
845 | retcode = rbsrt._preparenewrebase(destmap) | |
846 | if retcode is not None: |
|
846 | if retcode is not None: | |
847 | return retcode |
|
847 | return retcode | |
@@ -866,7 +866,7 b' def _origrebase(ui, repo, inmemory=False' | |||||
866 | rbsrt._performrebase(tr) |
|
866 | rbsrt._performrebase(tr) | |
867 | rbsrt._finishrebase() |
|
867 | rbsrt._finishrebase() | |
868 |
|
868 | |||
869 |
def _definedestmap(ui, repo, |
|
869 | def _definedestmap(ui, repo, inmemory, destf=None, srcf=None, basef=None, | |
870 | revf=None, destspace=None): |
|
870 | revf=None, destspace=None): | |
871 | """use revisions argument to define destmap {srcrev: destrev}""" |
|
871 | """use revisions argument to define destmap {srcrev: destrev}""" | |
872 | if revf is None: |
|
872 | if revf is None: | |
@@ -881,7 +881,7 b' def _definedestmap(ui, repo, rbsrt, dest' | |||||
881 | if revf and srcf: |
|
881 | if revf and srcf: | |
882 | raise error.Abort(_('cannot specify both a revision and a source')) |
|
882 | raise error.Abort(_('cannot specify both a revision and a source')) | |
883 |
|
883 | |||
884 |
if not |
|
884 | if not inmemory: | |
885 | cmdutil.checkunfinished(repo) |
|
885 | cmdutil.checkunfinished(repo) | |
886 | cmdutil.bailifchanged(repo) |
|
886 | cmdutil.bailifchanged(repo) | |
887 |
|
887 | |||
@@ -959,7 +959,7 b' def _definedestmap(ui, repo, rbsrt, dest' | |||||
959 |
|
959 | |||
960 | rebasingwcp = repo['.'].rev() in rebaseset |
|
960 | rebasingwcp = repo['.'].rev() in rebaseset | |
961 | ui.log("rebase", "", rebase_rebasing_wcp=rebasingwcp) |
|
961 | ui.log("rebase", "", rebase_rebasing_wcp=rebasingwcp) | |
962 |
if |
|
962 | if inmemory and rebasingwcp: | |
963 | # Check these since we did not before. |
|
963 | # Check these since we did not before. | |
964 | cmdutil.checkunfinished(repo) |
|
964 | cmdutil.checkunfinished(repo) | |
965 | cmdutil.bailifchanged(repo) |
|
965 | cmdutil.bailifchanged(repo) |
General Comments 0
You need to be logged in to leave comments.
Login now