Patchwork D11422: dirstate: use `tracked` property in `_addpath`

login
register
mail settings
Submitter phabricator
Date Sept. 16, 2021, 2:42 p.m.
Message ID <differential-rev-PHID-DREV-7tgh6bawpfdqeoicnz2i-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49738/
State Superseded
Headers show

Comments

phabricator - Sept. 16, 2021, 2:42 p.m.
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  It is semantically better.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D11422

AFFECTED FILES
  mercurial/dirstate.py

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -674,7 +674,7 @@ 
         possibly_dirty=False,
     ):
         entry = self._map.get(f)
-        if added or entry is not None and entry.removed:
+        if added or entry is not None and not entry.tracked:
             self._check_new_tracked_filename(f)
         self._dirty = True
         self._updatedfiles.add(f)