| quark | |
| yuja |
| hg-reviewers |
The old style raised errors in some cases.
| Lint Skipped |
| Unit Tests Skipped |
| def _assignworkingcopy(self): | def _assignworkingcopy(self): | ||||
| if self.inmemory: | if self.inmemory: | ||||
| from mercurial.context import overlayworkingctx | from mercurial.context import overlayworkingctx | ||||
| self.wctx = overlayworkingctx(self.repo) | self.wctx = overlayworkingctx(self.repo) | ||||
| self.repo.ui.debug("rebasing in-memory\n") | self.repo.ui.debug("rebasing in-memory\n") | ||||
| else: | else: | ||||
| self.wctx = self.repo[None] | self.wctx = self.repo[None] | ||||
| self.repo.ui.debug("rebasing on disk\n") | self.repo.ui.debug("rebasing on disk\n") | ||||
| self.repo.ui.log("rebase", "", { | self.repo.ui.log("rebase", "", rebase_imm_used=self.wctx.isinmemory()) | ||||
| 'rebase_imm_used': self.wctx.isinmemory() | |||||
| }) | |||||
| def _performrebase(self, tr): | def _performrebase(self, tr): | ||||
| self._assignworkingcopy() | self._assignworkingcopy() | ||||
| repo, ui = self.repo, self.ui | repo, ui = self.repo, self.ui | ||||
| if self.keepbranchesf: | if self.keepbranchesf: | ||||
| # insert _savebranch at the start of extrafns so if | # insert _savebranch at the start of extrafns so if | ||||
| # there's a user-provided extrafn it can clobber branch if | # there's a user-provided extrafn it can clobber branch if | ||||
| # desired | # desired | ||||
| # outweights the benefits of rebasing in-memory, and executing an extra | # outweights the benefits of rebasing in-memory, and executing an extra | ||||
| # update command adds a bit of overhead, so better to just do it on disk. In | # update command adds a bit of overhead, so better to just do it on disk. In | ||||
| # all other cases leave it on. | # all other cases leave it on. | ||||
| # | # | ||||
| # Note that there are cases where this isn't true -- e.g., rebasing large | # Note that there are cases where this isn't true -- e.g., rebasing large | ||||
| # stacks that include the WCP. However, I'm not yet sure where the cutoff | # stacks that include the WCP. However, I'm not yet sure where the cutoff | ||||
| # is. | # is. | ||||
| rebasingwcp = repo['.'].rev() in rebaseset | rebasingwcp = repo['.'].rev() in rebaseset | ||||
| ui.log("rebase", "", {'rebase_rebasing_wcp': rebasingwcp}) | ui.log("rebase", "", rebase_rebasing_wcp=rebasingwcp) | ||||
| if rbsrt.inmemory and rebasingwcp: | if rbsrt.inmemory and rebasingwcp: | ||||
| rbsrt.inmemory = False | rbsrt.inmemory = False | ||||
| # Check these since we did not before. | # Check these since we did not before. | ||||
| cmdutil.checkunfinished(repo) | cmdutil.checkunfinished(repo) | ||||
| cmdutil.bailifchanged(repo) | cmdutil.bailifchanged(repo) | ||||
| if not destf: | if not destf: | ||||
| dest = repo[_destrebase(repo, rebaseset, destspace=destspace)] | dest = repo[_destrebase(repo, rebaseset, destspace=destspace)] | ||||