This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8188

nodemap: make sure the nodemap docket is updated after the changelog
ClosedPublic

Authored by marmoute on Feb 28 2020, 1:55 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG448d700e0d27: nodemap: make sure the nodemap docket is updated after the changelog
Summary

It is better to have a lagging nodemap than a nodemap pointing to node that does
not exists yet.

(strictly speaking, the order was already right, however we make it more
explicit).

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

marmoute created this revision.Feb 28 2020, 1:55 PM
durin42 accepted this revision.Mar 10 2020, 4:43 PM
This revision is now accepted and ready to land.Mar 10 2020, 4:43 PM
marmoute updated this revision to Diff 20685.Mar 10 2020, 9:36 PM

rebase above latest default up to landed-D8182

Revision Contents
Changeset List

PathPackages
Mmercurial/revlogutils/nodemap.py (4 lines)

Diff 20705

mercurial/revlogutils/nodemap.py

"""Install whatever is needed transaction side to persist a nodemap on disk """Install whatever is needed transaction side to persist a nodemap on disk
(only actually persist the nodemap if this is relevant for this revlog) (only actually persist the nodemap if this is relevant for this revlog)
""" """
if revlog._inline: if revlog._inline:
return # inlined revlog are too small for this to be relevant return # inlined revlog are too small for this to be relevant
if revlog.nodemap_file is None: if revlog.nodemap_file is None:
return # we do not use persistent_nodemap on this revlog return # we do not use persistent_nodemap on this revlog
callback_id = b"revlog-persistent-nodemap-%s" % revlog.nodemap_file
# we need to happen after the changelog finalization, in that use "cl-"
callback_id = b"nm-revlog-persistent-nodemap-%s" % revlog.nodemap_file
if tr.hasfinalize(callback_id): if tr.hasfinalize(callback_id):
return # no need to register again return # no need to register again
tr.addpending( tr.addpending(
callback_id, lambda tr: _persist_nodemap(tr, revlog, pending=True) callback_id, lambda tr: _persist_nodemap(tr, revlog, pending=True)
) )
tr.addfinalize(callback_id, lambda tr: _persist_nodemap(tr, revlog)) tr.addfinalize(callback_id, lambda tr: _persist_nodemap(tr, revlog))