Patchwork D11585: dirstate-item: introduce a `p2_info` property that combine two others

login
register
mail settings
Submitter phabricator
Date Oct. 3, 2021, 12:26 a.m.
Message ID <differential-rev-PHID-DREV-gf5wllc2cq42jbaumnut-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49909/
State Superseded
Headers show

Comments

phabricator - Oct. 3, 2021, 12:26 a.m.
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  The `merged` and `from_p2` property are always used together so we can expose a
  combined property instead.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/cext/parsers.c
  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
@@ -301,6 +301,14 @@ 
         return True
 
     @property
+    def p2_info(self):
+        """True if the file needed to merge or apply any input from p2
+
+        See the class documentation for details.
+        """
+        return self._wc_tracked and self._p2_info
+
+    @property
     def merged(self):
         """True if the file has been merged
 
diff --git a/mercurial/cext/parsers.c b/mercurial/cext/parsers.c
--- a/mercurial/cext/parsers.c
+++ b/mercurial/cext/parsers.c
@@ -577,6 +577,16 @@ 
 	}
 };
 
+static PyObject *dirstate_item_get_p2_info(dirstateItemObject *self)
+{
+	if (self->flags & dirstate_flag_wc_tracked &&
+	    self->flags & dirstate_flag_p2_info) {
+		Py_RETURN_TRUE;
+	} else {
+		Py_RETURN_FALSE;
+	}
+};
+
 static PyObject *dirstate_item_get_merged(dirstateItemObject *self)
 {
 	if (dirstate_item_c_merged(self)) {
@@ -633,6 +643,7 @@ 
     {"state", (getter)dirstate_item_get_state, NULL, "state", NULL},
     {"tracked", (getter)dirstate_item_get_tracked, NULL, "tracked", NULL},
     {"added", (getter)dirstate_item_get_added, NULL, "added", NULL},
+    {"p2_info", (getter)dirstate_item_get_p2_info, NULL, "p2_info", NULL},
     {"merged", (getter)dirstate_item_get_merged, NULL, "merged", NULL},
     {"from_p2", (getter)dirstate_item_get_from_p2, NULL, "from_p2", NULL},
     {"maybe_clean", (getter)dirstate_item_get_maybe_clean, NULL, "maybe_clean",