# HG changeset patch # User Pierre-Yves David # Date 2022-01-31 13:26:35 # Node ID 111f5a0cbcaa7ac0bdb9f7549f93ce5df15cda40 # Parent cdb0d857afe2dfe90a7e279071b26fb955aa17d2 dirstate: rename the filegenerator used for writing We will need a different name in the next changesets. Changing the name is actually not that trivial so we do it in its own changeset. Differential Revision: https://phab.mercurial-scm.org/D12123 diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -706,7 +706,7 @@ class dirstate(object): if tr: # delay writing in-memory changes out tr.addfilegenerator( - b'dirstate', + b'dirstate-1-main', (self._filename,), lambda f: self._writedirstate(tr, f), location=b'plain', @@ -1374,7 +1374,7 @@ class dirstate(object): # changes written out above, even if dirstate is never # changed after this tr.addfilegenerator( - b'dirstate', + b'dirstate-1-main', (self._filename,), lambda f: self._writedirstate(tr, f), location=b'plain', diff --git a/mercurial/transaction.py b/mercurial/transaction.py --- a/mercurial/transaction.py +++ b/mercurial/transaction.py @@ -28,7 +28,10 @@ version = 2 # These are the file generators that should only be executed after the # finalizers are done, since they rely on the output of the finalizers (like # the changelog having been written). -postfinalizegenerators = {b'bookmarks', b'dirstate'} +postfinalizegenerators = { + b'bookmarks', + b'dirstate-1-main', +} GEN_GROUP_ALL = b'all' GEN_GROUP_PRE_FINALIZE = b'prefinalize'