martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers.
REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2710 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -565,7 +565,6 @@ editor = cmdutil.getcommiteditor(edit=editopt, editform=editform) revtoreuse = max(self.state) - dsguard = None if self.inmemory: newnode = concludememorynode(repo, revtoreuse, p1, self.external, @@ -575,6 +574,7 @@ 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): @@ -849,7 +849,6 @@ return retcode tr = None - dsguard = None singletr = ui.configbool('rebase', 'singletransaction') if singletr: @@ -861,6 +860,7 @@ with util.acceptintervention(tr): # Same logic for the dirstate guard, except we don't create one when # rebasing in-memory (it's not needed). + dsguard = None if singletr and not inmemory: dsguard = dirstateguard.dirstateguard(repo, 'rebase') with util.acceptintervention(dsguard): To: martinvonz, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
