lock: fix pin-depends with with- variables

master_changes.md

@@ -54,6 +54,7 @@ users)
 ## Repository
 
 ## Lock
+  * [BUG] Fix `pin-depends` for `with-*` dependencies [#5471 @rjbou - fix #5428]
 
 ## Clean
 

src/client/opamLockCommand.ml

@@ -274,8 +274,20 @@ let lock_opam ?(only_direct=false) st opam =
          (OpamPackage.Name.Set.elements uninstalled_depopts))
   in
   let pin_depends =
+    let pin_depends =
+      let is_pin nv = OpamSwitchState.is_pinned st nv.name in
+      let pins map set =
+        OpamPackage.Map.fold (fun nv _ set ->
+            if is_pin nv then OpamPackage.Set.add nv set else set)
+          map set
+      in
+      OpamPackage.Set.filter is_pin all_depends
+      |> pins dev_depends_map
+      |> pins test_depends_map
+      |> pins doc_depends_map
+      |> pins dev_setup_depends_map
+    in
     OpamPackage.Set.fold (fun nv acc ->
-        if not (OpamSwitchState.is_pinned st nv.name) then acc else
         match OpamSwitchState.primary_url st nv with
         | None -> acc
         | Some u ->
@@ -296,7 +308,7 @@ let lock_opam ?(only_direct=false) st opam =
                 | None -> local_warn ())
              | _ -> local_warn ())
           | None -> (nv, u) :: acc)
-      all_depends []
+      pin_depends []
     |> List.rev
   in
   opam

tests/reftests/lock.test

@@ -946,12 +946,6 @@ pin-depends: [
 ]
 ### <tolock/content>
 it's here
-### <pin:a-simple-dep/a-simple-dep.opam>
-opam-version: "2.0"
-### <pin:a-test-dep/a-test-dep.opam>
-opam-version: "2.0"
-### <pin:a-doc-dep/a-doc-dep.opam>
-opam-version: "2.0"
 ### <pin:opam>
 opam-version: "2.0"
 version: "dev"
@@ -1013,7 +1007,7 @@ license: "MIT"
 maintainer: "[email protected]"
 name: "tolock"
 opam-version: "2.0"
-pin-depends: ["a-simple-dep.dev" "git+https://github.com/dbuenzli/cmdliner#f239981642a"]
+pin-depends: [["a-doc-dep.dev" "git+https://github.com/dbuenzli/cmdliner#e8f8890fe48"] ["a-simple-dep.dev" "git+https://github.com/dbuenzli/cmdliner#f239981642a"] ["a-test-dep.dev" "git+https://github.com/dbuenzli/cmdliner#1de361182ab"]]
 synopsis: "A word"
 version: "dev"
 ### : Goblint format preserved error :