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

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

Differential Revision: https://phab.mercurial-scm.org/D11585

mercurial/cext/parsers.c

@@ -577,6 +577,16 b' static PyObject *dirstate_item_get_added'
 	}
 };
 
+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 b' static PyGetSetDef dirstate_item_getset['
     {"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",

mercurial/pure/parsers.py

@@ -301,6 +301,14 b' class DirstateItem(object):'
         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
 

rust/hg-core/src/dirstate/entry.rs

@@ -161,6 +161,10 b' impl DirstateEntry {'
         self.in_either_parent() && !self.flags.contains(Flags::WDIR_TRACKED)
     }
 
+    pub fn p2_info(&self) -> bool {
+        self.flags.contains(Flags::WDIR_TRACKED | Flags::P2_INFO)
+    }
+
     pub fn merged(&self) -> bool {
         self.flags
             .contains(Flags::WDIR_TRACKED | Flags::P1_TRACKED | Flags::P2_INFO)

rust/hg-cpython/src/dirstate/item.rs

@@ -71,6 +71,12 b' py_class!(pub class DirstateItem |py| {'
         Ok(self.entry(py).get().added())
     }
 
+
+    @property
+    def p2_info(&self) -> PyResult<bool> {
+        Ok(self.entry(py).get().p2_info())
+    }
+
     @property
     def merged(&self) -> PyResult<bool> {
         Ok(self.entry(py).get().merged())