Patchwork D6037: absorb: run cleanupnodes() within transaction also when not using obsmarkers

login
register
mail settings
Submitter phabricator
Date March 2, 2019, 2:14 a.m.
Message ID <66d6721cfea5bce1f5a155f552938569@localhost.localdomain>
Download mbox | patch
Permalink /patch/38991/
State Not Applicable
Headers show

Comments

phabricator - March 2, 2019, 2:14 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGc6a5009ed04a: absorb: run cleanupnodes() within transaction also when not using obsmarkers (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6037?vs=14270&id=14289

REVISION DETAIL
  https://phab.mercurial-scm.org/D6037

AFFECTED FILES
  hgext/absorb.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/hgext/absorb.py b/hgext/absorb.py
--- a/hgext/absorb.py
+++ b/hgext/absorb.py
@@ -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