##// END OF EJS Templates
fix: correctly set wdirwritten given that the dict item is deleted...
Danny Hooper -
r38985:35bc4b6e default
parent child Browse files
Show More
@@ -162,6 +162,7 b' def fix(ui, repo, *pats, **opts):'
162 # it makes the results more easily reproducible.
162 # it makes the results more easily reproducible.
163 filedata = collections.defaultdict(dict)
163 filedata = collections.defaultdict(dict)
164 replacements = {}
164 replacements = {}
165 wdirwritten = False
165 commitorder = sorted(revstofix, reverse=True)
166 commitorder = sorted(revstofix, reverse=True)
166 with ui.makeprogress(topic=_('fixing'), unit=_('files'),
167 with ui.makeprogress(topic=_('fixing'), unit=_('files'),
167 total=sum(numitems.values())) as progress:
168 total=sum(numitems.values())) as progress:
@@ -179,11 +180,12 b' def fix(ui, repo, *pats, **opts):'
179 ctx = repo[rev]
180 ctx = repo[rev]
180 if rev == wdirrev:
181 if rev == wdirrev:
181 writeworkingdir(repo, ctx, filedata[rev], replacements)
182 writeworkingdir(repo, ctx, filedata[rev], replacements)
183 wdirwritten = bool(filedata[rev])
182 else:
184 else:
183 replacerev(ui, repo, ctx, filedata[rev], replacements)
185 replacerev(ui, repo, ctx, filedata[rev], replacements)
184 del filedata[rev]
186 del filedata[rev]
185
187
186 cleanup(repo, replacements, bool(filedata[wdirrev]))
188 cleanup(repo, replacements, wdirwritten)
187
189
188 def cleanup(repo, replacements, wdirwritten):
190 def cleanup(repo, replacements, wdirwritten):
189 """Calls scmutil.cleanupnodes() with the given replacements.
191 """Calls scmutil.cleanupnodes() with the given replacements.
General Comments 0
You need to be logged in to leave comments. Login now