fix(pkg): pinning depopts (#10754)

depopts aren't conjunctions, but disjunctions

Signed-off-by: Rudi Grinberg <[email protected]>

Author: rgrinberg

src/dune_pkg/local_package.ml

@@ -147,12 +147,10 @@ let of_package (t : Dune_lang.Package.t) =
     let opam_file =
       Opam_file.read_from_string_exn ~contents:opam_file_string (Path.source file)
     in
-    let convert_filtered_formula filtered_formula =
-      Package_dependency.list_of_opam_filtered_formula loc filtered_formula
-    in
-    let dependencies = convert_filtered_formula (OpamFile.OPAM.depends opam_file) in
-    let conflicts = convert_filtered_formula (OpamFile.OPAM.conflicts opam_file) in
-    let depopts = convert_filtered_formula (OpamFile.OPAM.depopts opam_file) in
+    let convert_filtered_formula = Package_dependency.list_of_opam_filtered_formula loc in
+    let dependencies = convert_filtered_formula `And (OpamFile.OPAM.depends opam_file) in
+    let conflicts = convert_filtered_formula `And (OpamFile.OPAM.conflicts opam_file) in
+    let depopts = convert_filtered_formula `Or (OpamFile.OPAM.depopts opam_file) in
     let conflict_class =
       OpamFile.OPAM.conflict_class opam_file
       |> List.map ~f:Package_name.of_opam_package_name

src/dune_pkg/package_dependency.ml

@@ -7,7 +7,7 @@ module Convert_from_opam_error = struct
   type t =
     | Can't_convert_opam_filter_to_value of OpamTypes.filter
     | Can't_convert_opam_filter_to_condition of OpamTypes.filter
-    | Filtered_formula_is_not_a_conjunction_of_atoms of
+    | Filtered_formula_is_not_the_correct_kind of
         { non_atom : OpamTypes.filtered_formula }
 end
 
@@ -200,19 +200,21 @@ let list_to_opam_filtered_formula ts =
   |> OpamFormula.ands
 ;;
 
-let list_of_opam_filtered_formula loc filtered_formula =
+let list_of_opam_filtered_formula loc kind filtered_formula =
   let exception E of Convert_from_opam_error.t in
   try
-    OpamFormula.ands_to_list filtered_formula
+    (match kind with
+     | `And -> OpamFormula.ands_to_list
+     | `Or -> OpamFormula.ors_to_list)
+      filtered_formula
     |> List.map ~f:(fun (filtered_formula : OpamTypes.filtered_formula) ->
       match filtered_formula with
       | Atom (name, condition) ->
         let name = Package_name.of_opam_package_name name in
         (match Constraint.opt_of_opam_condition condition with
          | Ok constraint_ -> { name; constraint_ }
          | Error error -> raise (E error))
-      | non_atom ->
-        raise (E (Filtered_formula_is_not_a_conjunction_of_atoms { non_atom })))
+      | non_atom -> raise (E (Filtered_formula_is_not_the_correct_kind { non_atom })))
   with
   | E e ->
     let message =
@@ -229,11 +231,13 @@ let list_of_opam_filtered_formula loc filtered_formula =
           "Can't convert opam filter '%s' into dune condition. Only global variables may \
            appear in this position."
           filter_string
-      | Filtered_formula_is_not_a_conjunction_of_atoms { non_atom } ->
+      | Filtered_formula_is_not_the_correct_kind { non_atom } ->
         let formula_string = OpamFilter.string_of_filtered_formula non_atom in
         sprintf
-          "Expected formula to be a conjunction of atoms but encountered non-atom term \
-           '%s'"
+          "Expected formula to be a %s of atoms but encountered non-atom term '%s'"
+          (match kind with
+           | `And -> "conjunction"
+           | `Or -> "disjunction")
           formula_string
     in
     User_error.raise ~loc [ Pp.text message ]

src/dune_pkg/package_dependency.mli

@@ -29,4 +29,8 @@ val list_to_opam_filtered_formula : t list -> OpamTypes.filtered_formula
 
 (** Attempt to interpret a [OpamTypes.filtered_formula] as a list of [t]s by
     treating the formula as a conjunction of packages with constraints. *)
-val list_of_opam_filtered_formula : Loc.t -> OpamTypes.filtered_formula -> t list
+val list_of_opam_filtered_formula
+  :  Loc.t
+  -> [ `Or | `And ]
+  -> OpamTypes.filtered_formula
+  -> t list

test/blackbox-tests/test-cases/pkg/pin-stanza/pin-depopts.t

@@ -29,15 +29,3 @@ package with depopts.
   $ dune pkg lock
   Solution for dune.lock:
   - pkg-with-depopts.5.2.0
-
-Try locking the project again after adding a bare dune-project file to
-the pinned package. Currently this doesn't work correctly. See
-https://github.com/ocaml/dune/issues/10739
-  $ cat > pkg-with-depopts/dune-project <<EOF
-  > (lang dune 3.16)
-  > EOF
-  $ dune pkg lock
-  File "pkg-with-depopts/pkg-with-depopts.opam", line 1, characters 0-0:
-  Error: Expected formula to be a conjunction of atoms but encountered non-atom
-  term 'option-a | option-b'
-  [1]