Patchwork D8188: nodemap: make sure the nodemap docket is updated after the changelog

login
register
mail settings
Submitter phabricator
Date March 11, 2020, 1:36 a.m.
Message ID <9bfee2871312d182c0a06b6242059fa6@localhost.localdomain>
Download mbox | patch
Permalink /patch/45687/
State Not Applicable
Headers show

Comments

phabricator - March 11, 2020, 1:36 a.m.
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




To: marmoute, #hg-reviewers, durin42
Cc: mercurial-devel

Patch

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(