D11425: dirstate: replace `_add` call in `setparent`
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Thu Sep 16 14:42:49 UTC 2021
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION SUMMARY
Same logic as the previous changeset, it get us closer to removed older API on
the dirstate.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D11425
AFFECTED FILES
mercurial/dirstate.py
CHANGE DETAILS
diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -409,7 +409,13 @@
source = self._map.copymap.get(f)
if source:
copies[f] = source
- self._add(f)
+ self._check_new_tracked_filename(f)
+ self._updatedfiles.add(f)
+ self._map.reset_state(
+ f,
+ p1_tracked=False,
+ wc_tracked=True,
+ )
return copies
def setbranch(self, branch):
To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
More information about the Mercurial-devel
mailing list