Show More
@@ -784,7 +784,8 b' def rebase(ui, repo, **opts):' | |||||
784 | return retcode |
|
784 | return retcode | |
785 | else: |
|
785 | else: | |
786 | destmap = _definedestmap(ui, repo, destf, srcf, basef, revf, |
|
786 | destmap = _definedestmap(ui, repo, destf, srcf, basef, revf, | |
787 |
destspace=destspace |
|
787 | destspace=destspace, | |
|
788 | inmemory=opts['inmemory']) | |||
788 | retcode = rbsrt._preparenewrebase(destmap) |
|
789 | retcode = rbsrt._preparenewrebase(destmap) | |
789 | if retcode is not None: |
|
790 | if retcode is not None: | |
790 | return retcode |
|
791 | return retcode | |
@@ -804,7 +805,7 b' def rebase(ui, repo, **opts):' | |||||
804 | rbsrt._finishrebase() |
|
805 | rbsrt._finishrebase() | |
805 |
|
806 | |||
806 | def _definedestmap(ui, repo, destf=None, srcf=None, basef=None, revf=None, |
|
807 | def _definedestmap(ui, repo, destf=None, srcf=None, basef=None, revf=None, | |
807 | destspace=None): |
|
808 | destspace=None, inmemory=False): | |
808 | """use revisions argument to define destmap {srcrev: destrev}""" |
|
809 | """use revisions argument to define destmap {srcrev: destrev}""" | |
809 | if revf is None: |
|
810 | if revf is None: | |
810 | revf = [] |
|
811 | revf = [] | |
@@ -818,8 +819,9 b' def _definedestmap(ui, repo, destf=None,' | |||||
818 | if revf and srcf: |
|
819 | if revf and srcf: | |
819 | raise error.Abort(_('cannot specify both a revision and a source')) |
|
820 | raise error.Abort(_('cannot specify both a revision and a source')) | |
820 |
|
821 | |||
821 | cmdutil.checkunfinished(repo) |
|
822 | if not inmemory: | |
822 |
cmdutil. |
|
823 | cmdutil.checkunfinished(repo) | |
|
824 | cmdutil.bailifchanged(repo) | |||
823 |
|
825 | |||
824 | if ui.configbool('commands', 'rebase.requiredest') and not destf: |
|
826 | if ui.configbool('commands', 'rebase.requiredest') and not destf: | |
825 | raise error.Abort(_('you must specify a destination'), |
|
827 | raise error.Abort(_('you must specify a destination'), |
General Comments 0
You need to be logged in to leave comments.
Login now