[Updated] D11438: dirstate: support file tracked nowhere in `reset_state`
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Mon Sep 20 14:08:35 UTC 2021
Closed by commit rHG938a7769050c: dirstate: support file tracked nowhere in `reset_state` (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/D11438?vs=30276&id=30320
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D11438/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D11438
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
@@ -180,8 +180,8 @@
def reset_state(
self,
filename,
- wc_tracked,
- p1_tracked,
+ wc_tracked=False,
+ p1_tracked=False,
p2_tracked=False,
merged=False,
clean_p1=False,
@@ -206,7 +206,10 @@
self.copymap.pop(filename, None)
if not (p1_tracked or p2_tracked or wc_tracked):
- self.dropfile(filename)
+ old_entry = self._map.pop(filename, None)
+ self._dirs_decr(filename, old_entry=old_entry)
+ self.nonnormalset.discard(filename)
+ self.copymap.pop(filename, None)
return
elif merged:
# XXX might be merged and removed ?
@@ -576,8 +579,8 @@
def reset_state(
self,
filename,
- wc_tracked,
- p1_tracked,
+ wc_tracked=False,
+ p1_tracked=False,
p2_tracked=False,
merged=False,
clean_p1=False,
To: marmoute, #hg-reviewers, Alphare
Cc: Alphare, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210920/e8169c6d/attachment-0002.html>
More information about the Mercurial-patches
mailing list