new approach with consistent trait

Author: memsharded

conan/internal/model/requires.py

@@ -9,7 +9,8 @@ class Requirement:
     """
     def __init__(self, ref, *, headers=None, libs=None, build=False, run=None, visible=None,
                  transitive_headers=None, transitive_libs=None, test=None, package_id_mode=None,
-                 force=None, override=None, direct=None, options=None, no_skip=False):
+                 force=None, override=None, direct=None, options=None, no_skip=False,
+                 consistent=None):
         # * prevents the usage of more positional parameters, always ref + **kwargs
         # By default this is a generic library requirement
         self.ref = ref
@@ -26,6 +27,7 @@ def __init__(self, ref, *, headers=None, libs=None, build=False, run=None, visib
         self._force = force
         self._override = override
         self._direct = direct
+        self._consistent = consistent
         self.options = options
         # Meta and auxiliary information
         # The "defining_require" is the require that defines the current value. If this require is
@@ -102,6 +104,15 @@ def direct(self):
     def direct(self, value):
         self._direct = value
 
+    @property
+    def consistent(self):
+        default_consistent = self.visible or self.test
+        return self._default_if_none(self._consistent, default_consistent)
+
+    @consistent.setter
+    def consistent(self, value):
+        self._consistent = value
+
     @property
     def build(self):
         return self._build
@@ -229,8 +240,7 @@ def __eq__(self, other):
                  (self.headers and other.headers) or
                  (self.libs and other.libs) or
                  (self.run and other.run) or
-                 (self.test and other.test) or
-                 (self.visible or other.visible) or  # THIS IS AN OR!!
+                 (self.consistent and other.consistent) or
                  (self.ref == other.ref and self.options == other.options)))
 
     def aggregate(self, other):
@@ -350,6 +360,8 @@ def transform_downstream(self, pkg_type, require, dep_pkg_type):
         # if required.run is not None:
         #    downstream_require.run = required.run
 
+        downstream_require.consistent = require.consistent and self.consistent
+
         if self.test:
             downstream_require.test = True
 

test/integration/graph/conflict_diamond_test.py

@@ -399,12 +399,12 @@ def test_visible_order_issue():
                                                              .with_requires("lib_a/[>=1]"),
             "libc/conanfile.py": GenConanfile("lib_c", "1.0").with_package_type("shared-library")
                                                              .with_requirement("lib_b/1.0",
-                                                                               visible=False)
+                                                                               visible=False, consistent=True)
                                                              .with_requirement("lib_a/1.1"),
             "libc2/conanfile.py": GenConanfile("lib_c", "1.0").with_package_type("shared-library")
                                                               .with_requirement("lib_a/1.1")
                                                               .with_requirement("lib_b/1.0",
-                                                                                visible=False),
+                                                                                visible=False, consistent=True),
             })
     c.run("export liba --version=1.0")
     c.run("export liba --version=1.1")
@@ -428,12 +428,12 @@ def test_visible_order_full_diamond_issue():
                                                              .with_requires("lib_a/1.1"),
             "libc/conanfile.py": GenConanfile("lib_c", "1.0").with_package_type("shared-library")
                                                              .with_requirement("lib_b/1.0",
-                                                                               visible=False)
+                                                                               visible=False, consistent=True)
                                                              .with_requirement("lib_d/1.0"),
             "libc2/conanfile.py": GenConanfile("lib_c", "1.0").with_package_type("shared-library")
                                                               .with_requirement("lib_d/1.0")
                                                               .with_requirement("lib_b/1.0",
-                                                                                visible=False),
+                                                                                visible=False, consistent=True),
             })
     c.run("export liba --version=1.0")
     c.run("export liba --version=1.1")

test/integration/graph/ux/loop_detection_test.py

@@ -81,6 +81,6 @@ def generate(self):
             "app/conanfile.py": conanfile})
 
     c.run("create cmake")
-    c.run("install app", assert_error=True)
-    # It doesn't hang, and it sees correctly the duplicated dependency
-    assert "Duplicated requirement: cmake/3.31.6" in c.out
+    c.run("install app")
+    # It doesn't hang, and it sees correctly just 1 dependency
+    assert "conanfile.py (test/1.0): NUM DEPS: 1" in c.out