Patchwork D10973: dirstate-entry: add a `tracked` property

login
register
mail settings
Submitter phabricator
Date July 4, 2021, 9:55 p.m.
Message ID <differential-rev-PHID-DREV-npsv5eadeitcemcrlqxz-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49287/
State Superseded
Headers show

Comments

phabricator - July 4, 2021, 9:55 p.m.
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  This abstract the individual `state` value and has a clear semantic.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/cext/parsers.c
  mercurial/dirstate.py
  mercurial/pure/parsers.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/pure/parsers.py b/mercurial/pure/parsers.py
--- a/mercurial/pure/parsers.py
+++ b/mercurial/pure/parsers.py
@@ -87,6 +87,11 @@ 
         return self._state
 
     @property
+    def tracked(self):
+        """True is the file is tracked in the working copy"""
+        return self._state in b"nma"
+
+    @property
     def added(self):
         """True if the file has been added"""
         return self._state == b'a'
diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -1313,7 +1313,7 @@ 
             size = t[2]
             time = t[3]
 
-            if not st and state in b"nma":
+            if not st and t.tracked:
                 dadd(fn)
             elif state == b'n':
                 if (
diff --git a/mercurial/cext/parsers.c b/mercurial/cext/parsers.c
--- a/mercurial/cext/parsers.c
+++ b/mercurial/cext/parsers.c
@@ -158,6 +158,15 @@ 
 	return PyBytes_FromStringAndSize(&self->state, 1);
 };
 
+static PyObject *dirstatetuple_get_tracked(dirstateTupleObject *self)
+{
+	if (self->state == 'a' || self->state == 'm' || self->state == 'n') {
+		Py_RETURN_TRUE;
+	} else {
+		Py_RETURN_FALSE;
+	}
+};
+
 static PyObject *dirstatetuple_get_added(dirstateTupleObject *self)
 {
 	if (self->state == 'a') {
@@ -214,6 +223,7 @@ 
 
 static PyGetSetDef dirstatetuple_getset[] = {
     {"state", (getter)dirstatetuple_get_state, NULL, "state", NULL},
+    {"tracked", (getter)dirstatetuple_get_tracked, NULL, "tracked", NULL},
     {"added", (getter)dirstatetuple_get_added, NULL, "added", NULL},
     {"merged_removed", (getter)dirstatetuple_get_merged_removed, NULL,
      "merged_removed", NULL},