D8188: nodemap: make sure the nodemap docket is updated after the changelog
marmoute created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION 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). REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8188 AFFECTED FILES mercurial/revlogutils/nodemap.py CHANGE DETAILS diff --git a/mercurial/revlogutils/nodemap.py b/mercurial/revlogutils/nodemap.py --- a/mercurial/revlogutils/nodemap.py +++ b/mercurial/revlogutils/nodemap.py @@ -72,7 +72,9 @@ return # inlined revlog are too small for this to be relevant if revlog.nodemap_file is None: 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): return # no need to register again tr.addpending( To: marmoute, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D8188: nodemap: make sure the nodemap docket is updated after the changelog
marmoute added a comment. marmoute updated this revision to Diff 20685. rebase above latest default up to landed-D8182 REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8188?vs=20391&id=20685 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8188/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8188 AFFECTED FILES mercurial/revlogutils/nodemap.py CHANGE DETAILS diff --git a/mercurial/revlogutils/nodemap.py b/mercurial/revlogutils/nodemap.py --- a/mercurial/revlogutils/nodemap.py +++ b/mercurial/revlogutils/nodemap.py @@ -72,7 +72,9 @@ return # inlined revlog are too small for this to be relevant if revlog.nodemap_file is None: 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): return # no need to register again tr.addpending( To: marmoute, #hg-reviewers, durin42 Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D8188: nodemap: make sure the nodemap docket is updated after the changelog
Closed by commit rHG448d700e0d27: nodemap: make sure the nodemap docket is updated after the changelog (authored by marmoute). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8188?vs=20685&id=20705 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8188/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8188 AFFECTED FILES mercurial/revlogutils/nodemap.py CHANGE DETAILS diff --git a/mercurial/revlogutils/nodemap.py b/mercurial/revlogutils/nodemap.py --- a/mercurial/revlogutils/nodemap.py +++ b/mercurial/revlogutils/nodemap.py @@ -72,7 +72,9 @@ return # inlined revlog are too small for this to be relevant if revlog.nodemap_file is None: 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): return # no need to register again tr.addpending( To: marmoute, #hg-reviewers, durin42 Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
