Solving portable lockdir includes avoid-version message (#12679)

This message was accidentally removed in a recent change to the format
of the output of `dune pkg lock` when using portable lockdirs, but it's
a useful message, so add it back.

Signed-off-by: Stephen Sherratt <[email protected]>

Author: gridbugs

bin/pkg/lock.ml

@@ -207,13 +207,22 @@ let summary_message
   if portable_lock_dir
   then (
     let pkgs_by_platform = Lock_dir.Packages.pkgs_by_platform lock_dir.packages in
+    let opam_package_of_pkg (pkg : Lock_dir.Pkg.t) =
+      OpamPackage.create
+        (Dune_pkg.Package_name.to_opam_package_name pkg.info.name)
+        (Dune_pkg.Package_version.to_opam_package_version pkg.info.version)
+    in
+    let pkgs_by_opam_package =
+      Lock_dir.Packages.to_pkg_list lock_dir.packages
+      |> List.map ~f:(fun pkg -> opam_package_of_pkg pkg, pkg)
+      |> OpamPackage.Map.of_list
+    in
+    let opam_package_to_pkg opam_package =
+      OpamPackage.Map.find opam_package pkgs_by_opam_package
+    in
     let opam_package_sets_by_platform =
       Solver_env.Map.map pkgs_by_platform ~f:(fun pkgs ->
-        List.map pkgs ~f:(fun (pkg : Dune_pkg.Lock_dir.Pkg.t) ->
-          OpamPackage.create
-            (Dune_pkg.Package_name.to_opam_package_name pkg.info.name)
-            (Dune_pkg.Package_version.to_opam_package_version pkg.info.version))
-        |> OpamPackage.Set.of_list)
+        List.map pkgs ~f:opam_package_of_pkg |> OpamPackage.Set.of_list)
     in
     let common_packages =
       Solver_env.Map.values opam_package_sets_by_platform
@@ -223,9 +232,11 @@ let summary_message
     let pp_package_set package_set =
       if OpamPackage.Set.is_empty package_set
       then Pp.tag User_message.Style.Warning @@ Pp.text "(none)"
-      else
-        Pp.enumerate (OpamPackage.Set.elements package_set) ~f:(fun opam_package ->
-          Pp.text (OpamPackage.to_string opam_package))
+      else (
+        let pkgs =
+          OpamPackage.Set.elements package_set |> List.map ~f:opam_package_to_pkg
+        in
+        Pkg_common.pp_packages pkgs)
     in
     let uncommon_packages_by_platform =
       Solver_env.Map.map opam_package_sets_by_platform ~f:(fun package_set ->

test/blackbox-tests/test-cases/pkg/portable-lockdirs/portable-lockdirs-print-avoid-version.t

@@ -0,0 +1,30 @@
+When solving portable lockdirs, if any packages in the solution are marked
+avoid-version, include a message to that extent in the output.
+
+  $ . ../helpers.sh
+  $ mkrepo
+  $ add_mock_repo_if_needed
+
+  $ mkpkg foo <<EOF
+  > conflicts: [ "a1" ]
+  > flags: [avoid-version]
+  > EOF
+
+  $ cat > dune-project <<EOF
+  > (lang dune 3.18)
+  > (package
+  >  (name x)
+  >  (depends foo))
+  > EOF
+
+  $ DUNE_CONFIG__PORTABLE_LOCK_DIR=enabled dune pkg lock
+  Solution for dune.lock
+  
+  This solution supports the following platforms:
+  - arch = x86_64; os = linux
+  - arch = arm64; os = linux
+  - arch = x86_64; os = macos
+  - arch = arm64; os = macos
+  
+  Dependencies on all supported platforms:
+  - foo.0.0.1 (this version should be avoided)