explore replace_requires references adjustements

conans/client/graph/graph.py

@@ -68,6 +68,7 @@ def __init__(self, ref, conanfile, context, recipe=None, path=None, test=False):
         self.should_build = False  # If the --build or policy wants to build this binary
         self.build_allowed = False
         self.is_conf = False
+        self.replaced_requires = {}  # To track the replaced requires for self.dependencies[old-ref]
 
     def __lt__(self, other):
         """

conans/client/graph/graph_builder.py

@@ -312,6 +312,7 @@ def _resolve_replace_requires(self, node, require, profile_build, profile_host,
                 node.conanfile.requires.reindex(require, alternative_ref.name)
             require.ref.name = alternative_ref.name
             graph.replaced_requires[original_require] = repr(require.ref)
+            node.replaced_requires[original_require] = require
             break  # First match executes the alternative and finishes checking others
 
     def _create_new_node(self, node, require, graph, profile_host, profile_build, graph_lock):

conans/model/dependencies.py

@@ -91,6 +91,12 @@ class ConanFileDependencies(UserRequirementsDict):
     def from_node(node):
         d = OrderedDict((require, ConanFileInterface(transitive.node.conanfile))
                         for require, transitive in node.transitive_deps.items())
+        for old_req, new_req in node.replaced_requires.items():
+            existing = d.get(new_req)
+            if existing is not None:
+                added_req = new_req.copy_requirement()
+                added_req.ref = RecipeReference.loads(old_req)
+                d[added_req] = existing
         return ConanFileDependencies(d)
 
     def filter(self, require_filter, remove_system=True):

test/integration/graph/test_replace_requires.py

@@ -1,4 +1,5 @@
 import json
+import textwrap
 
 import pytest
 
@@ -147,3 +148,36 @@ def test_replace_requires_json_format():
     assert "pkg/0.1: pkg/0.2" in c.out  # The replacement happens
     graph = json.loads(c.stdout)
     assert graph["graph"]["replaced_requires"] == {"pkg/0.1": "pkg/0.2"}
+
+
+def test_replace_requires_consumer_references():
+    c = TestClient(light=True)
+    conanfile = textwrap.dedent("""
+        from conan import ConanFile
+        class App(ConanFile):
+            name = "app"
+            version = "0.1"
+            requires = "zlib/0.1"
+            def generate(self):
+                assert self.dependencies["zlib"] is self.dependencies["zlib-ng"]
+                self.output.info(f"DEP ZLIB generate: {self.dependencies['zlib'].ref.name}!")
+            def build(self):
+                assert self.dependencies["zlib"] is self.dependencies["zlib-ng"]
+                self.output.info(f"DEP ZLIB build: {self.dependencies['zlib'].ref.name}!")
+            def package_info(self):
+                assert self.dependencies["zlib"] is self.dependencies["zlib-ng"]
+                # self.cpp_info.requires = ["zlib::zlib"]
+        """)
+    c.save({"zlibng/conanfile.py": GenConanfile("zlib-ng", "0.1"),
+            "app/conanfile.py": conanfile,
+            "profile": "[replace_requires]\nzlib/0.1: zlib-ng/0.1"})
+    c.run("create zlibng")
+    c.run("build app -pr=profile")
+    assert "zlib/0.1: zlib-ng/0.1" in c.out
+    assert "conanfile.py (app/0.1): DEP ZLIB generate: zlib-ng!" in c.out
+    assert "conanfile.py (app/0.1): DEP ZLIB build: zlib-ng!" in c.out
+    c.run("create app -pr=profile")
+    assert "zlib/0.1: zlib-ng/0.1" in c.out
+    assert "conanfile.py (app/0.1): DEP ZLIB generate: zlib-ng!" in c.out
+    assert "conanfile.py (app/0.1): DEP ZLIB build: zlib-ng!" in c.out
+    # FIXME: The self.cpp_info.requires is still broken