[Updated] D11332: dirstatemap: also discard item from sets
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Fri Aug 27 12:39:26 UTC 2021
Closed by commit rHGbbae583333e9: dirstatemap: also discard item from sets (authored by marmoute).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D11332?vs=30058&id=30101
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D11332/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D11332
AFFECTED FILES
mercurial/dirstatemap.py
CHANGE DETAILS
diff --git a/mercurial/dirstatemap.py b/mercurial/dirstatemap.py
--- a/mercurial/dirstatemap.py
+++ b/mercurial/dirstatemap.py
@@ -199,8 +199,12 @@
self._map[f] = new_entry
if new_entry.dm_nonnormal:
self.nonnormalset.add(f)
+ else:
+ self.nonnormalset.discard(f)
if new_entry.dm_otherparent:
self.otherparentset.add(f)
+ else:
+ self.otherparentset.discard(f)
def reset_state(
self,
To: marmoute, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210827/032efbc5/attachment-0002.html>
More information about the Mercurial-patches
mailing list