# HG changeset patch
# User Danny Hooper <hooper@google.com>
# Date 1533596400 25200
# Node ID 35bc4b6e132d320636cd5ff62519b4d0f92ae8f2
# Parent  b0c591950e51e286de71d7d75886a7cff7d2e1ea
fix: correctly set wdirwritten given that the dict item is deleted

Differential Revision: https://phab.mercurial-scm.org/D4146

diff -r b0c591950e51 -r 35bc4b6e132d hgext/fix.py
--- a/hgext/fix.py	Mon Aug 06 14:30:27 2018 -0700
+++ b/hgext/fix.py	Mon Aug 06 16:00:00 2018 -0700
@@ -162,6 +162,7 @@
         # it makes the results more easily reproducible.
         filedata = collections.defaultdict(dict)
         replacements = {}
+        wdirwritten = False
         commitorder = sorted(revstofix, reverse=True)
         with ui.makeprogress(topic=_('fixing'), unit=_('files'),
                              total=sum(numitems.values())) as progress:
@@ -179,11 +180,12 @@
                     ctx = repo[rev]
                     if rev == wdirrev:
                         writeworkingdir(repo, ctx, filedata[rev], replacements)
+                        wdirwritten = bool(filedata[rev])
                     else:
                         replacerev(ui, repo, ctx, filedata[rev], replacements)
                     del filedata[rev]
 
-        cleanup(repo, replacements, bool(filedata[wdirrev]))
+        cleanup(repo, replacements, wdirwritten)
 
 def cleanup(repo, replacements, wdirwritten):
     """Calls scmutil.cleanupnodes() with the given replacements.