Merge branch 'develop2' into xcodebuild-extend

Author: memsharded

conan/__init__.py

@@ -2,5 +2,5 @@
 from conan.internal.model.workspace import Workspace
 from conan.internal.model.version import Version
 
-__version__ = '2.18.0-dev'
+__version__ = '2.19.0-dev'
 conan_version = Version(__version__)

conan/api/subapi/cache.py

@@ -259,6 +259,14 @@ def get_backup_sources(self, package_list=None, exclude=True, only_upload=True):
         download_cache = DownloadCache(download_cache_path)
         return download_cache.get_backup_sources_files(excluded_urls, package_list, only_upload)
 
+    def path_to_ref(self, path):
+        cache = PkgCache(self.conan_api.cache_folder, self.conan_api.config.global_conf)
+        result = cache.path_to_ref(path)
+        if result is None:
+            base, folder = os.path.split(path)
+            result = cache.path_to_ref(base)
+        return result
+
 
 def _resolve_latest_ref(cache, ref):
     if ref.revision is None or ref.revision == "latest":

conan/api/subapi/new.py

@@ -96,6 +96,8 @@ def get_builtin_template(template_name):
         from conan.internal.api.new.bazel_7_exe import bazel_exe_files_7
         from conan.internal.api.new.autotools_lib import autotools_lib_files
         from conan.internal.api.new.autoools_exe import autotools_exe_files
+        from conan.internal.api.new.premake_lib import premake_lib_files
+        from conan.internal.api.new.premake_exe import premake_exe_files
         from conan.internal.api.new.local_recipes_index import local_recipes_index_files
         from conan.internal.api.new.qbs_lib import qbs_lib_files
         from conan.internal.api.new.workspace import workspace_files
@@ -114,6 +116,8 @@ def get_builtin_template(template_name):
                          "bazel_7_exe": bazel_exe_files_7,
                          "autotools_lib": autotools_lib_files,
                          "autotools_exe": autotools_exe_files,
+                         "premake_lib": premake_lib_files,
+                         "premake_exe": premake_exe_files,
                          "alias": alias_file,
                          "local_recipes_index": local_recipes_index_files,
                          "qbs_lib": qbs_lib_files,

conan/api/subapi/workspace.py

@@ -109,17 +109,33 @@ def packages(self):
         """
         if not self._folder or not self._enabled:
             return
-        editables = self._ws.packages()
-        editables = {RecipeReference.loads(r): v.copy() for r, v in editables.items()}
-        for v in editables.values():
-            path = os.path.normpath(os.path.join(self._folder, v["path"], "conanfile.py"))
+        packages = {}
+        for editable_info in self._ws.packages():
+            rel_path = editable_info["path"]
+            path = os.path.normpath(os.path.join(self._folder, rel_path, "conanfile.py"))
             if not os.path.isfile(path):
                 raise ConanException(f"Workspace editable not found: {path}")
-            v["path"] = path
-            if v.get("output_folder"):
-                v["output_folder"] = os.path.normpath(os.path.join(self._folder,
-                                                                   v["output_folder"]))
-        return editables
+            ref = editable_info.get("ref")
+            try:
+                if ref is None:
+                    conanfile = self._ws.load_conanfile(rel_path)
+                    reference = RecipeReference(name=conanfile.name, version=conanfile.version,
+                                                user=conanfile.user, channel=conanfile.channel)
+                else:
+                    reference = RecipeReference.loads(ref)
+                reference.validate_ref(reference)
+            except:
+                raise ConanException(f"Workspace editable reference could not be deduced by"
+                                     f" {rel_path}/conanfile.py or it is not"
+                                     f" correctly defined in the conanws.yml file.")
+            if reference in packages:
+                raise ConanException(f"Workspace editable reference '{str(reference)}' already exists.")
+            packages[reference] = {"path": path}
+            if editable_info.get("output_folder"):
+                packages[reference]["output_folder"] = (
+                    os.path.normpath(os.path.join(self._folder, editable_info["output_folder"]))
+                )
+        return packages
 
     def open(self, require, remotes, cwd=None):
         app = ConanApp(self._conan_api)

conan/cli/commands/cache.py

@@ -64,6 +64,19 @@ def cache_path(conan_api: ConanAPI, parser, subparser, *args):
     return path
 
 
+@conan_subcommand(formatters={"text": cli_out_write})
+def cache_ref(conan_api: ConanAPI, parser, subparser, *args):
+    """
+    Show the reference for a given Conan cache folder
+    """
+    subparser.add_argument("path", help="Path to a Conan cache folder")
+    args = parser.parse_args(*args)
+    ref = conan_api.cache.path_to_ref(args.path)
+    if ref is None:
+        raise ConanException("Reference for this path not found in cache")
+    return ref.repr_notime()
+
+
 @conan_subcommand()
 def cache_clean(conan_api: ConanAPI, parser, subparser, *args):
     """

conan/cli/commands/export_pkg.py

@@ -38,7 +38,6 @@ def export_pkg(conan_api, parser, *args):
 
     cwd = os.getcwd()
     path = conan_api.local.get_conanfile_path(args.path, cwd, py=True)
-    test_conanfile_path = _get_test_conanfile_path(args.test_folder, path)
     overrides = eval(args.lockfile_overrides) if args.lockfile_overrides else None
     lockfile = conan_api.lockfile.get_lockfile(lockfile=args.lockfile, conanfile_path=path,
                                                cwd=cwd, partial=args.lockfile_partial,
@@ -92,6 +91,9 @@ def export_pkg(conan_api, parser, *args):
     lockfile = conan_api.lockfile.update_lockfile(lockfile, deps_graph, args.lockfile_packages,
                                                   clean=args.lockfile_clean)
 
+    test_package_folder = getattr(conanfile, "test_package_folder", None) \
+        if args.test_folder is None else args.test_folder
+    test_conanfile_path = _get_test_conanfile_path(test_package_folder, path)
     if test_conanfile_path:
         from conan.cli.commands.test import run_test
         # same as ``conan create`` the lockfile, and deps graph is the one of the exported-pkg

conan/cli/commands/workspace.py

@@ -93,6 +93,13 @@ def print_json(data):
 
 
 def _print_workspace_info(data):
+    ret = []
+    for package_info in data["info"]["packages"]:
+        ret.append(f"- path: {package_info['path']}")
+        ref = package_info.get('ref')
+        if ref:
+            ret.append(f"  ref: {ref}")
+    data["info"]["packages"] = ret or "(empty)"
     print_serial(data["info"])
 
 

conan/cli/formatters/graph/info_graph_html.py

@@ -44,7 +44,7 @@
                     <label for="show_package_type">Show package type</label>
                 </div>
                  <div>
-                    <input type="search" placeholder="Search packages..." oninput="searchPackages(this)">
+                    <input type="search" placeholder="Search packages..." oninput="searchPackages(this)" onkeydown="onSearchKeyDown(event)">
                 </div>
                  <div>
                     <input type="search" placeholder="Exclude packages..." title="Add a comma to exclude an additional package" oninput="excludePackages(this)">
@@ -64,6 +64,7 @@
             let hide_build = false;
             let hide_test = false;
             let search_pkgs = null;
+            let focus_search = false;
             let excluded_pkgs = null;
             let collapse_packages = false;
             let show_package_type = false;
@@ -135,6 +136,9 @@
                         if (patterns.some(pattern => label.match(pattern))) {
                             borderWidth = 3;
                             borderColor = "Magenta";
+                            if (focus_search) {
+                                focus_search = node_id;
+                            }
                         }
                     }
                     if (node.test) {
@@ -312,6 +316,10 @@
                 network.setData(data);
                 network.redraw();
                 network.moveTo({position: viewPos, scale: scale});
+                // If we have found a package to focus, we need to move the view
+                if (typeof focus_search === "string") {
+                    network.focus(focus_search, {animation: true, locked: false});
+                }
             }
             function switchBuild() {
                 hide_build = !hide_build;
@@ -325,13 +333,28 @@
                 collapse_packages = !collapse_packages;
                 draw();
             }
+            const debounce = (func, delay) => {
+                let timeout;
+                return function(...args) {
+                    clearTimeout(timeout);
+                    timeout = setTimeout(() => func.apply(this, args), delay);
+                };
+            };
+            const debouncedDraw = debounce(draw, 300);
             function searchPackages(e) {
                 search_pkgs = e.value;
-                draw();
+                debouncedDraw();
+            }
+            function onSearchKeyDown(event) {
+                if (event.key === "Enter") {
+                    focus_search = true;
+                    draw();
+                    focus_search = false;
+                }
             }
             function excludePackages(e) {
                 excluded_pkgs = e.value;
-                draw();
+                debouncedDraw();
             }
             function showPackageType(e) {
                 show_package_type = !show_package_type;

conan/cli/formatters/report/diff_html.py

@@ -32,56 +32,70 @@
             }
         </style>
         <script>
+            function debounce(func, delay) {
+                let timeout;
+                return function(...args) {
+                    const context = this;
+                    clearTimeout(timeout);
+                    timeout = setTimeout(() => {
+                        func.apply(context, args);
+                    }, delay);
+                };
+            }
             let includeSearchQuery = "";
             let excludeSearchQuery = "";
 
-            async function onExcludeSearchInput(event) {
-                excludeSearchQuery = event.currentTarget.value.toLowerCase();
-                onSearchInput(event);
-            }
-
-            async function onIncludeSearchInput(event) {
-                includeSearchQuery = event.currentTarget.value.toLowerCase();
-                onSearchInput(event);
-            }
-
             async function onSearchInput(event) {
                 const sidebar = document.querySelectorAll(".sidebar li");
                 const content = document.querySelectorAll(".content .diff-content");
+                const searchingIcon = document.getElementById("searching_icon");
+
+                searchingIcon.style.display = "inline-block";
+
+                let emptySearch = true;
 
                 sidebar.forEach(async function(item) {
                     const text = item.textContent.toLowerCase();
                     const shouldInclude = includeSearchQuery === "" || text.includes(includeSearchQuery);
                     const shouldExclude = excludeSearchQuery !== "" && text.includes(excludeSearchQuery);
+                    const associatedId = item.querySelector("a").getAttribute("href").substring(1)
+                    const contentItem = document.getElementById(associatedId);
 
                     if (shouldInclude) {
                         if (shouldExclude) {
                             item.style.display = "none";
+                            contentItem.style.display = "none";
                         } else {
                             item.style.display = "list-item";
+                            contentItem.style.display = "block";
+                            emptySearch = false;
                         }
                     } else {
                         item.style.display = "none";
+                        contentItem.style.display = "none";
                     }
 
                 });
 
-                content.forEach(async function(item) {
-                    const filename = document.getElementById(item.id + "_filename");
-                    const text = filename.dataset.replacedPaths.toLowerCase();
-                    const shouldInclude = includeSearchQuery === "" || text.includes(includeSearchQuery);
-                    const shouldExclude = excludeSearchQuery !== "" && text.includes(excludeSearchQuery);
+                searchingIcon.style.display = "none";
+                const emptySearchTag = document.getElementById("empty_search");
+                if (emptySearch) {
+                    emptySearchTag.style.display = "block";
+                } else {
+                    emptySearchTag.style.display = "none";
+                }
+            }
 
-                    if (shouldInclude) {
-                        if (shouldExclude) {
-                            item.style.display = "none";
-                        } else {
-                            item.style.display = "block";
-                        }
-                    } else {
-                        item.style.display = "none";
-                    }
-                });
+            const debouncedOnSearchInput = debounce(onSearchInput, 500);
+
+             async function onExcludeSearchInput(event) {
+                excludeSearchQuery = event.currentTarget.value.toLowerCase();
+                debouncedOnSearchInput(event);
+            }
+
+            async function onIncludeSearchInput(event) {
+                includeSearchQuery = event.currentTarget.value.toLowerCase();
+                debouncedOnSearchInput(event);
             }
         </script>
     </head>
@@ -96,10 +110,12 @@
                 <h2>File list:</h2>
                 <input type="text" id="search-include" placeholder="Include search..." oninput="onIncludeSearchInput(event)" />
                 <input type="text" id="search-exclude" placeholder="Exclude search..." oninput="onExcludeSearchInput(event)" />
+                <span id="searching_icon" style="display:none">...</span>
                 <ul>
                     {%- for filename in content.keys() %}
                         <li><a href="#diff_{{- safe_filename(filename) -}}" class="side-link">{{ replace_cache_paths(filename) }}</a></li>
                     {%- endfor %}
+                    <span id="empty_search" style="display:none">No results found</span>
                 </ul>
             </div>
             <div class='content'>

conan/cli/printers/graph.py

@@ -98,6 +98,12 @@ def _format_resolved(title, reqs_to_print):
     if deprecated:
         output.warning("There are deprecated packages in the graph", warn_tag="risk")
 
+    if graph.visibility_conflicts:
+        msg = ["Packages required both with visible=True and visible=False"]
+        for ref, consumers in graph.visibility_conflicts.items():
+            msg.append(f"    {ref}: Required by {', '.join(str(c) for c in consumers)}")
+        output.warning("\n".join(msg), warn_tag="risk")
+
 
 def print_graph_packages(graph):
     # I am excluding the "download"-"cache" or remote information, that is not