# HG changeset patch # User Martin von Zweigbergk # Date 1551368751 28800 # Node ID c6a5009ed04a91b5328b6012b4d6a3a86f03d691 # Parent 8e364664a9997e2e08f78f076c3bdb86f7f6863a absorb: run cleanupnodes() within transaction also when not using obsmarkers scmutil.cleanupnodes() schedules stripping to be done after the current transaction, so we can safely run it within the transaction. This also means that the phase will be updated within the transaction, which I believe means that the initial (possibly incorrect) phase will not visible. Differential Revision: https://phab.mercurial-scm.org/D6037 diff -r 8e364664a999 -r c6a5009ed04a hgext/absorb.py --- a/hgext/absorb.py Sat Mar 02 05:23:15 2019 +0530 +++ b/hgext/absorb.py Thu Feb 28 07:45:51 2019 -0800 @@ -688,9 +688,6 @@ self._movebookmarks(tr) if self.repo['.'].node() in self.replacemap: self._moveworkingdirectoryparent() - if self._useobsolete: - self._cleanupoldcommits() - if not self._useobsolete: # strip must be outside transactions self._cleanupoldcommits() return self.finalnode