Merge pull request #6055 from rjbou/cudf-encode

Package name encoding in conflict message

Author: kit-ty-kate

master_changes.md

@@ -27,6 +27,7 @@ users)
 ## Actions
 
 ## Install
+  * Fix package name display for no agreement conflicts [#6055 @rjbou - fix #6030]
 
 ## Remove
 
@@ -110,6 +111,7 @@ users)
   * cli versioning: untie output from current major version [#6045 @rjbou]
   * Set `opam-version` to 2.2 for some conflict message tests based on opam repository to stabilise their output [#6045 @rjbou]
   * [BUG]: head -c is not posix compliant. Use cut -b instead. [#5989 @madroach]
+  * Add bad cudf package name encoding (dose3 lib) [#6055 @rjbou]
 
 ### Engine
 

src/solver/opamCudf.ml

@@ -426,7 +426,7 @@ module Package = struct
   type t = Cudf.package
   include Dose_common.CudfAdd
   let to_string = string_of_package
-  let name_to_string t = t.Cudf.package
+  let name_to_string t = OpamPackage.name_to_string (cudf2opam t)
   let version_to_string t = string_of_int t.Cudf.version
   let to_json = to_json
   let of_json = of_json

tests/reftests/dune.inc

@@ -542,6 +542,24 @@
    %{targets}
    (run ./run.exe %{exe:../../src/client/opamMain.exe.exe} %{dep:empty-conflicts-006.test} %{read-lines:testing-env}))))
 
+(rule
+ (alias reftest-empty-conflicts-007)
+ (action
+  (diff empty-conflicts-007.test empty-conflicts-007.out)))
+
+(alias
+ (name reftest)
+ (deps (alias reftest-empty-conflicts-007)))
+
+(rule
+ (targets empty-conflicts-007.out)
+ (deps root-N0REP0)
+ (package opam)
+ (action
+  (with-stdout-to
+   %{targets}
+   (run ./run.exe %{exe:../../src/client/opamMain.exe.exe} %{dep:empty-conflicts-007.test} %{read-lines:testing-env}))))
+
 (rule
  (alias reftest-env)
  (action

tests/reftests/empty-conflicts-007.test

@@ -0,0 +1,24 @@
+N0REP0
+### : Test the output of 'No agreement' package name, du to Dose_Common.package encoding
+### : see https://github.com/ocaml/opam/issues/6030
+### <pkg:foo.1>
+opam-version: "2.0"
+depends: "ba_z" { > "2" }
+### <pkg:bar.1>
+opam-version: "2.0"
+depends: "ba_z" { < "2" }
+### <pkg:ba_z.1>
+opam-version: "2.0"
+### <pkg:ba_z.2>
+opam-version: "2.0"
+### <pkg:ba_z.3>
+opam-version: "2.0"
+### opam switch create --empty encode-cudf
+### opam install bar foo
+[ERROR] Package conflict!
+  * No agreement on the version of ba_z:
+    - bar -> ba_z < 2
+    - foo -> ba_z >= 3
+
+No solution found, exiting
+# Return code 20 #