Patchwork D8176: transaction: clarify the logic around pre-finalize/post-finalize

login
register
mail settings
Submitter phabricator
Date Feb. 28, 2020, 12:05 p.m.
Message ID <differential-rev-PHID-DREV-6wy2gzplrejjpicw3bjc-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/45376/
State Superseded
Headers show

Comments

phabricator - Feb. 28, 2020, 12:05 p.m.
marmoute created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  I am taking a bit more verbose route, but I find it easier to follow for people
  who (re)discover the code.
  
  (This is a gratuitous cleanup I did while looking at something else.)

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D8176

AFFECTED FILES
  mercurial/transaction.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/transaction.py b/mercurial/transaction.py
--- a/mercurial/transaction.py
+++ b/mercurial/transaction.py
@@ -355,16 +355,22 @@ 
     def _generatefiles(self, suffix=b'', group=GEN_GROUP_ALL):
         # write files registered for generation
         any = False
+
+        if group == GEN_GROUP_ALL:
+            skip_post = skip_pre = False
+        else:
+            skip_pre = group == GEN_GROUP_POST_FINALIZE
+            skip_post = group == GEN_GROUP_PRE_FINALIZE
+
         for id, entry in sorted(pycompat.iteritems(self._filegenerators)):
             any = True
             order, filenames, genfunc, location = entry
 
             # for generation at closing, check if it's before or after finalize
-            postfinalize = group == GEN_GROUP_POST_FINALIZE
-            if (
-                group != GEN_GROUP_ALL
-                and (id in postfinalizegenerators) != postfinalize
-            ):
+            is_post = id in postfinalizegenerators
+            if skip_post and is_post:
+                continue
+            elif skip_pre and not is_post:
                 continue
 
             vfs = self._vfsmap[location]