Mercurial > public > mercurial-scm > hg-stable
diff mercurial/transaction.py @ 48699:21ac6aedd5e5
transaction: do not rely on a global variable to post_finalize file
We can just add a new argument to the `addfilegenerator` function. This is more
explicit and therefor clearer and less error prone.
Differential Revision: https://phab.mercurial-scm.org/D12125
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 31 Jan 2022 18:38:15 +0100 |
| parents | 568f63b5a30f |
| children | 6000f5b25c9b |
line wrap: on
line diff
--- a/mercurial/transaction.py Mon Jan 31 08:44:48 2022 +0100 +++ b/mercurial/transaction.py Mon Jan 31 18:38:15 2022 +0100 @@ -25,16 +25,6 @@ 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-0-key-pre', - b'dirstate-1-main', - b'dirstate-2-key-post', -} - GEN_GROUP_ALL = b'all' GEN_GROUP_PRE_FINALIZE = b'prefinalize' GEN_GROUP_POST_FINALIZE = b'postfinalize' @@ -339,7 +329,13 @@ @active def addfilegenerator( - self, genid, filenames, genfunc, order=0, location=b'' + self, + genid, + filenames, + genfunc, + order=0, + location=b'', + post_finalize=False, ): """add a function to generates some files at transaction commit @@ -362,10 +358,14 @@ The `location` arguments may be used to indicate the files are located outside of the the standard directory for transaction. It should match one of the key of the `transaction.vfsmap` dictionary. + + The `post_finalize` argument can be set to `True` for file generation + that must be run after the transaction has been finalized. """ # For now, we are unable to do proper backup and restore of custom vfs # but for bookmarks that are handled outside this mechanism. - self._filegenerators[genid] = (order, filenames, genfunc, location) + entry = (order, filenames, genfunc, location, post_finalize) + self._filegenerators[genid] = entry @active def removefilegenerator(self, genid): @@ -385,13 +385,12 @@ for id, entry in sorted(pycompat.iteritems(self._filegenerators)): any = True - order, filenames, genfunc, location = entry + order, filenames, genfunc, location, post_finalize = entry # for generation at closing, check if it's before or after finalize - is_post = id in postfinalizegenerators - if skip_post and is_post: + if skip_post and post_finalize: continue - elif skip_pre and not is_post: + elif skip_pre and not post_finalize: continue vfs = self._vfsmap[location]