diff -r 0dcf50dc90b6 -r 17a744c5e270 hgext/rebase.py --- a/hgext/rebase.py Mon Mar 12 23:08:47 2018 -0400 +++ b/hgext/rebase.py Fri Mar 09 10:35:48 2018 -0800 @@ -573,16 +573,12 @@ keepbranches=self.keepbranchesf, date=self.date, wctx=self.wctx) else: - dsguard = None - if ui.configbool('rebase', 'singletransaction'): - dsguard = dirstateguard.dirstateguard(repo, 'rebase') - with util.acceptintervention(dsguard): - newnode = concludenode(repo, revtoreuse, p1, self.external, - commitmsg=commitmsg, - extrafn=_makeextrafn(self.extrafns), - editor=editor, - keepbranches=self.keepbranchesf, - date=self.date) + newnode = concludenode(repo, revtoreuse, p1, self.external, + commitmsg=commitmsg, + extrafn=_makeextrafn(self.extrafns), + editor=editor, + keepbranches=self.keepbranchesf, + date=self.date) if newnode is not None: newrev = repo[newnode].rev() for oldrev in self.state: @@ -864,8 +860,7 @@ dsguard = dirstateguard.dirstateguard(repo, 'rebase') with util.acceptintervention(dsguard): rbsrt._performrebase(tr) - - rbsrt._finishrebase() + rbsrt._finishrebase() def _definedestmap(ui, repo, rbsrt, destf=None, srcf=None, basef=None, revf=None, destspace=None):