Show More
@@ -390,6 +390,9 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", "", { | |||
|
394 | 'rebase_imm_used': self.wctx.isinmemory() | |||
|
395 | }) | |||
393 |
|
396 | |||
394 | def _performrebase(self, tr): |
|
397 | def _performrebase(self, tr): | |
395 | self._assignworkingcopy() |
|
398 | self._assignworkingcopy() | |
@@ -957,6 +960,7 def _definedestmap(ui, repo, rbsrt, dest | |||||
957 | # stacks that include the WCP. However, I'm not yet sure where the cutoff |
|
960 | # stacks that include the WCP. However, I'm not yet sure where the cutoff | |
958 | # is. |
|
961 | # is. | |
959 | rebasingwcp = repo['.'].rev() in rebaseset |
|
962 | rebasingwcp = repo['.'].rev() in rebaseset | |
|
963 | ui.log("rebase", "", {'rebase_rebasing_wcp': rebasingwcp}) | |||
960 | if rbsrt.inmemory and rebasingwcp: |
|
964 | if rbsrt.inmemory and rebasingwcp: | |
961 | rbsrt.inmemory = False |
|
965 | rbsrt.inmemory = False | |
962 | # Check these since we did not before. |
|
966 | # Check these since we did not before. |
General Comments 0
You need to be logged in to leave comments.
Login now