Show More
@@ -390,9 +390,7 b' class rebaseruntime(object):' | |||||
390 | else: |
|
390 | else: | |
391 | self.wctx = self.repo[None] |
|
391 | self.wctx = self.repo[None] | |
392 | self.repo.ui.debug("rebasing on disk\n") |
|
392 | self.repo.ui.debug("rebasing on disk\n") | |
393 |
self.repo.ui.log("rebase", "", |
|
393 | self.repo.ui.log("rebase", "", rebase_imm_used=self.wctx.isinmemory()) | |
394 | 'rebase_imm_used': self.wctx.isinmemory() |
|
|||
395 | }) |
|
|||
396 |
|
394 | |||
397 | def _performrebase(self, tr): |
|
395 | def _performrebase(self, tr): | |
398 | self._assignworkingcopy() |
|
396 | self._assignworkingcopy() | |
@@ -966,7 +964,7 b' def _definedestmap(ui, repo, rbsrt, dest' | |||||
966 | # stacks that include the WCP. However, I'm not yet sure where the cutoff |
|
964 | # stacks that include the WCP. However, I'm not yet sure where the cutoff | |
967 | # is. |
|
965 | # is. | |
968 | rebasingwcp = repo['.'].rev() in rebaseset |
|
966 | rebasingwcp = repo['.'].rev() in rebaseset | |
969 |
ui.log("rebase", "", |
|
967 | ui.log("rebase", "", rebase_rebasing_wcp=rebasingwcp) | |
970 | if rbsrt.inmemory and rebasingwcp: |
|
968 | if rbsrt.inmemory and rebasingwcp: | |
971 | rbsrt.inmemory = False |
|
969 | rbsrt.inmemory = False | |
972 | # Check these since we did not before. |
|
970 | # Check these since we did not before. |
General Comments 0
You need to be logged in to leave comments.
Login now