D4146: fix: correctly set wdirwritten given that the dict item is deleted
hooper (Danny Hooper)
phabricator at mercurial-scm.org
Mon Aug 6 23:52:34 UTC 2018
hooper created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D4146
AFFECTED FILES
hgext/fix.py
CHANGE DETAILS
diff --git a/hgext/fix.py b/hgext/fix.py
--- a/hgext/fix.py
+++ b/hgext/fix.py
@@ -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.
To: hooper, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list