irmin: port to the 1.4.0 interfaces

Signed-off-by: Anil Madhavapeddy <[email protected]>

Author: avsm

api/ocaml/git/datakit_client_git.ml

@@ -656,7 +656,7 @@ let tree t h =
   match S.Tree.Hash.of_string h with
   | Error e -> Lwt.return (Error (e :> error))
   | Ok hash ->
-    S.Tree.of_hash t.repo hash >|= function
+    S.Tree.of_hash t.repo (`Node hash) >|= function
     | None   -> err_msg "%s is not a valid tree" h
     | Some x -> Ok x
 

datakit.opam

@@ -17,7 +17,7 @@ depends: [
   "asetmap"
   "git" {>= "1.11.5"}
   "uri" {>="2.0.0"}
-  "irmin" {>= "1.2.0" & < "1.4.0"}
+  "irmin" {>="1.4.0"}
   "irmin-mem" {>= "1.2.0"}
   "irmin-git" {>= "1.2.0"}
   "cstruct" {>= "2.2"}

src/datakit/datakit.ml

@@ -643,8 +643,9 @@ module Vfs (Store : Store.S) = struct
     | Some (`Contents (f, `Exec))   -> hash f >|= Fmt.strf "X-%a\n" pp_hash
     | Some (`Contents (f, `Link))   -> hash f >|= Fmt.strf "L-%a\n" pp_hash
     | Some (`Node _ as dir) ->
-      Store.Tree.hash repo dir >|= fun h ->
-      Fmt.strf "D-%a\n" Store.Tree.Hash.pp h
+      Store.Tree.hash repo dir >|= function
+       | `Node n -> Fmt.strf "D-%a\n" Store.Tree.Hash.pp n
+       | `Contents (c,m) -> Fmt.strf "D-%a\n" Store.Contents.Hash.pp c
 
   let watch_tree_stream store ~path ~init =
     let session = Vfs.File.Stream.session init in
@@ -880,7 +881,7 @@ module Vfs (Store : Store.S) = struct
             Ok (Vfs.File.ro_of_string ~perm data |> Vfs.Inode.file name)
         end
       | `Node hash ->
-        Store.Tree.of_hash repo hash >|= function
+        Store.Tree.of_hash repo (`Node hash) >|= function
         | None      -> Vfs.Error.no_entry
         | Some data ->
           Ok (ro_tree ~name:"ro" ~get_root:(fun () -> Lwt.return data))