| krbullock |
| hg-reviewers |
Since IMM doesn't affect the dirstate, it's not needed, and might be faster.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| for rebased in sorted(self.state): | for rebased in sorted(self.state): | ||||
| if rebased not in self.skipped: | if rebased not in self.skipped: | ||||
| commitmsg += '\n* %s' % repo[rebased].description() | commitmsg += '\n* %s' % repo[rebased].description() | ||||
| editopt = True | editopt = True | ||||
| editor = cmdutil.getcommiteditor(edit=editopt, editform=editform) | editor = cmdutil.getcommiteditor(edit=editopt, editform=editform) | ||||
| revtoreuse = max(self.state) | revtoreuse = max(self.state) | ||||
| dsguard = None | dsguard = None | ||||
| if ui.configbool('rebase', 'singletransaction'): | |||||
| dsguard = dirstateguard.dirstateguard(repo, 'rebase') | |||||
| if self.inmemory: | if self.inmemory: | ||||
| newnode = concludememorynode(repo, revtoreuse, p1, | newnode = concludememorynode(repo, revtoreuse, p1, | ||||
| self.external, | self.external, | ||||
| commitmsg=commitmsg, | commitmsg=commitmsg, | ||||
| extrafn=_makeextrafn(self.extrafns), | extrafn=_makeextrafn(self.extrafns), | ||||
| editor=editor, | editor=editor, | ||||
| keepbranches=self.keepbranchesf, | keepbranches=self.keepbranchesf, | ||||
| date=self.date, wctx=self.wctx) | date=self.date, wctx=self.wctx) | ||||
| else: | else: | ||||
| if ui.configbool('rebase', 'singletransaction'): | |||||
| dsguard = dirstateguard.dirstateguard(repo, 'rebase') | |||||
| with util.acceptintervention(dsguard): | with util.acceptintervention(dsguard): | ||||
| newnode = concludenode(repo, revtoreuse, p1, self.external, | newnode = concludenode(repo, revtoreuse, p1, self.external, | ||||
| commitmsg=commitmsg, | commitmsg=commitmsg, | ||||
| extrafn=_makeextrafn(self.extrafns), | extrafn=_makeextrafn(self.extrafns), | ||||
| editor=editor, | editor=editor, | ||||
| keepbranches=self.keepbranchesf, | keepbranches=self.keepbranchesf, | ||||
| date=self.date) | date=self.date) | ||||
| if newnode is not None: | if newnode is not None: | ||||
| return retcode | return retcode | ||||
| tr = None | tr = None | ||||
| dsguard = None | dsguard = None | ||||
| singletr = ui.configbool('rebase', 'singletransaction') | singletr = ui.configbool('rebase', 'singletransaction') | ||||
| if singletr: | if singletr: | ||||
| tr = repo.transaction('rebase') | tr = repo.transaction('rebase') | ||||
| # If `rebase.singletransaction` is enabled, wrap the entire operation in | |||||
| # one transaction here. Otherwise, transactions are obtained when | |||||
| # committing each node, which is slower but allows partial success. | |||||
| with util.acceptintervention(tr): | with util.acceptintervention(tr): | ||||
| if singletr: | # Same logic for the dirstate guard, except we don't create one when | ||||
| # rebasing in-memory (it's not needed). | |||||
| if singletr and not inmemory: | |||||
| dsguard = dirstateguard.dirstateguard(repo, 'rebase') | dsguard = dirstateguard.dirstateguard(repo, 'rebase') | ||||
| with util.acceptintervention(dsguard): | with util.acceptintervention(dsguard): | ||||
| rbsrt._performrebase(tr) | rbsrt._performrebase(tr) | ||||
| rbsrt._finishrebase() | rbsrt._finishrebase() | ||||
| def _definedestmap(ui, repo, rbsrt, destf=None, srcf=None, basef=None, | def _definedestmap(ui, repo, rbsrt, destf=None, srcf=None, basef=None, | ||||
| revf=None, destspace=None): | revf=None, destspace=None): | ||||
| raise error.Abort(_('unable to collapse on top of %s, there is more ' | raise error.Abort(_('unable to collapse on top of %s, there is more ' | ||||
| 'than one external parent: %s') % | 'than one external parent: %s') % | ||||
| (max(destancestors), | (max(destancestors), | ||||
| ', '.join(str(p) for p in sorted(parents)))) | ', '.join(str(p) for p in sorted(parents)))) | ||||
| def concludememorynode(repo, rev, p1, p2, wctx=None, | def concludememorynode(repo, rev, p1, p2, wctx=None, | ||||
| commitmsg=None, editor=None, extrafn=None, | commitmsg=None, editor=None, extrafn=None, | ||||
| keepbranches=False, date=None): | keepbranches=False, date=None): | ||||
| '''Commit the wd changes with parents p1 and p2. Reuse commit info from rev | '''Commit the memory changes with parents p1 and p2. Reuse commit info from | ||||
| but also store useful information in extra. | rev but also store useful information in extra. | ||||
| Return node of committed revision.''' | Return node of committed revision.''' | ||||
| ctx = repo[rev] | ctx = repo[rev] | ||||
| if commitmsg is None: | if commitmsg is None: | ||||
| commitmsg = ctx.description() | commitmsg = ctx.description() | ||||
| keepbranch = keepbranches and repo[p1].branch() != ctx.branch() | keepbranch = keepbranches and repo[p1].branch() != ctx.branch() | ||||
| extra = {'rebase_source': ctx.hex()} | extra = {'rebase_source': ctx.hex()} | ||||
| if extrafn: | if extrafn: | ||||
| extrafn(ctx, extra) | extrafn(ctx, extra) | ||||