This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6037

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

Authored by martinvonz on Feb 28 2019, 11:03 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc6a5009ed04a: absorb: run cleanupnodes() within transaction also when not using obsmarkers
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Feb 28 2019, 11:03 AM
Closed by commit rHGc6a5009ed04a: absorb: run cleanupnodes() within transaction also when not using obsmarkers (authored by martinvonz). · Explain WhyMar 1 2019, 9:14 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/absorb.py (3 lines)

Diff 14289

hgext/absorb.py

def commit(self): def commit(self):
"""commit changes. update self.finalnode, self.replacemap""" """commit changes. update self.finalnode, self.replacemap"""
with self.repo.wlock(), self.repo.lock(): with self.repo.wlock(), self.repo.lock():
with self.repo.transaction('absorb') as tr: with self.repo.transaction('absorb') as tr:
self._commitstack() self._commitstack()
self._movebookmarks(tr) self._movebookmarks(tr)
if self.repo['.'].node() in self.replacemap: if self.repo['.'].node() in self.replacemap:
self._moveworkingdirectoryparent() self._moveworkingdirectoryparent()
if self._useobsolete:
self._cleanupoldcommits()
if not self._useobsolete: # strip must be outside transactions
self._cleanupoldcommits() self._cleanupoldcommits()
return self.finalnode return self.finalnode
def printchunkstats(self): def printchunkstats(self):
"""print things like '1 of 2 chunk(s) applied'""" """print things like '1 of 2 chunk(s) applied'"""
ui = self.ui ui = self.ui
chunkstats = self.chunkstats chunkstats = self.chunkstats
if ui.verbose: if ui.verbose: