Apply API change from ocaml/opam#6680

Author: kit-ty-kate

src/lib/check.mli

@@ -19,6 +19,6 @@
 
 open OpamTypes
 
-val packages: dirname -> dirname -> unit
+val packages: OpamRepositoryRoot.Dir.t -> dirname -> unit
 
 val contents: dirname -> package -> OpamFile.OPAM.t -> unit

src/lib/opamlib.mli

@@ -26,7 +26,7 @@ val default_switch: switch
 
 (** opam-lib functions *)
 
-val repo_opams: dirname -> OpamFile.OPAM.t package_map
+val repo_opams: OpamRepositoryRoot.Dir.t -> OpamFile.OPAM.t package_map
 
 
 (** CLI functions *)
@@ -86,4 +86,3 @@ val pinned: dirname -> string list list
 val import: dirname -> ?fake:bool -> filename -> unit
 
 val export: dirname -> filename -> unit
-

src/lib/packages.ml

@@ -183,8 +183,9 @@ let file_list repo prefix nv =
   let opam = OpamRepositoryPath.opam repo prefix nv in
   let files = OpamRepositoryPath.files repo prefix nv in
   let archive =
+    let ( /// ) = OpamRepositoryRoot.Dir.Op.( / ) in
     OpamFilename.Op.(
-      repo / ".." / "repo_archives" // (OpamPackage.to_string nv ^ ".tar.gz"))
+      repo /// ".." / "repo_archives" // (OpamPackage.to_string nv ^ ".tar.gz"))
   in
   opam, files, archive
 
@@ -302,7 +303,8 @@ let add repo contents_root t =
   let opamfile_present = OpamFilename.exists opamf in
   let files_present = OpamFilename.exists_dir files in
   if opamfile_present then
-    (Git.add repo opamf;
+    (let repo = OpamRepositoryRoot.Dir.to_dir repo in
+     Git.add repo opamf;
      if files_present then Git.add_dir repo files;
      Git.commit repo "Add package %s (%s%s)"
        (OpamPackage.to_string t.nv)

src/lib/packages.mli

@@ -47,11 +47,11 @@ val prefix: package -> string option
 
 val files: int -> (basename * string * int) list
 
-val write: dirname -> dirname -> t -> unit
+val write: OpamRepositoryRoot.Dir.t -> dirname -> t -> unit
 
-val read: dirname -> dirname -> string option -> package -> t
+val read: OpamRepositoryRoot.Dir.t -> dirname -> string option -> package -> t
 
-val add: dirname -> dirname -> t -> unit
+val add: OpamRepositoryRoot.Dir.t -> dirname -> t -> unit
 
 (** Create package content *)
 
@@ -60,4 +60,3 @@ val content_create: package -> int -> (basename * string * int) list
 val content_read: dirname -> package -> (basename * string * int) list
 
 val content_write: dirname -> package -> (basename * string * int) list -> unit
-

src/tests/dev_update.ml

@@ -44,11 +44,12 @@ let test_u path =
   let { repo_root; opam_root; _ } =
     read_config path
   in
-  let opams = Opamlib.repo_opams repo_root in
+  let opams = Opamlib.repo_opams (OpamRepositoryRoot.Dir.of_dir repo_root) in
   let opams =
     OpamPackage.Map.union (fun _ x -> x) opams @@
     Opamlib.repo_opams
-      (OpamPath.Switch.Overlay.dir opam_root Opamlib.default_switch)
+      (OpamRepositoryRoot.Dir.of_dir
+         (OpamPath.Switch.Overlay.dir opam_root Opamlib.default_switch))
   in
   let packages =
     OpamPackage.Map.fold (fun nv opam acc ->

src/tests/pin_install.ml

@@ -41,7 +41,7 @@ let init_u contents_kind path =
     let b2 = Packages.add_depend b2 "a" ~formula:(Atom (`Eq, FString "2")) in
     [ a1; a2; b1; b2 ]
   in
-  List.iter (Packages.add repo_root contents_root) packages;
+  List.iter (Packages.add (OpamRepositoryRoot.Dir.of_dir repo_root) contents_root) packages;
   write_repo_config path repo_name (repo_url, None);
   Opamlib.init opam_root repo_name repo_url;
   Opamlib.update opam_root;
@@ -98,7 +98,7 @@ let test_u path =
   Opamlib.remove opam_root a;
   Opamlib.unpin opam_root a;
   let a3 = package "a" 3 (Some `rsync) contents_root 452 in
-  Packages.add repo_root contents_root a3;
+  Packages.add (OpamRepositoryRoot.Dir.of_dir repo_root) contents_root a3;
   Opamlib.update opam_root;
   check_installed path [];
   step "Pin a to version 2 and install";

src/tests/repo_update.ml

@@ -62,7 +62,7 @@ let test_u path =
       update_server_index repo_root repo_url;
       Opamlib.update opam_root;
       Opamlib.upgrade opam_root [];
-      Check.packages repo_root opam_root;
+      Check.packages (OpamRepositoryRoot.Dir.of_dir repo_root) opam_root;
     ) (shuffle commits);
   stop_server ()
 

src/tests/utils.ml

@@ -160,7 +160,7 @@ let create_repo_with_history repo contents_root =
   let repo_file =
     OpamFile.Repo.create ~opam_version:OpamFile.Repo.format_version ()
   in
-  let repo_filename = OpamRepositoryPath.repo repo in
+  let repo_filename = OpamRepositoryPath.repo (OpamRepositoryRoot.Dir.of_dir repo) in
   OpamFile.Repo.write repo_filename repo_file;
   Git.commit_file repo (OpamFile.filename repo_filename) "Initialise repo";
   let all = [
@@ -171,7 +171,7 @@ let create_repo_with_history repo contents_root =
     a2 contents_root 1;
     a2 contents_root 0;
   ] @ random_list 5 (ar contents_root) in
-  List.iter (Packages.add repo contents_root) all;
+  List.iter (Packages.add (OpamRepositoryRoot.Dir.of_dir repo) contents_root) all;
   Git.branch repo
 
 (* Create a repository with a single package without archive file and
@@ -182,13 +182,13 @@ let create_simple_repo repo contents_root contents_kind =
   let repo_file =
     OpamFile.Repo.create ~opam_version:OpamFile.Repo.format_version ()
   in
-  let repo_filename = OpamRepositoryPath.repo repo in
+  let repo_filename = OpamRepositoryPath.repo (OpamRepositoryRoot.Dir.of_dir repo) in
   OpamFile.Repo.write repo_filename repo_file;
   Git.commit_file repo (OpamFile.filename repo_filename) "Initialise repo";
   let package0 =
     package "a" 1 contents_kind contents_root ~gener_archive:false 10
   in
-  Packages.add repo contents_root package0;
+  Packages.add (OpamRepositoryRoot.Dir.of_dir repo) contents_root package0;
   let all =
     package0
     :: random_list 20 (fun _ ->
@@ -197,7 +197,7 @@ let create_simple_repo repo contents_root contents_kind =
       )
   in
   List.iter (fun package ->
-      Packages.write repo contents_root package
+      Packages.write (OpamRepositoryRoot.Dir.of_dir repo) contents_root package
     ) all;
   Git.branch OpamFilename.Op.(contents_root / "a.1");