Skip to content

Commit 7d0e701

Browse files
balatclaude
andcommitted
Fix irmin-client and irmin-server for Node type changes
- Add inline_contents_max_bytes to client Repo (returns 0) - Simplify Node.merge type in client (key instead of key * key list) - Simplify node_with_inlined type alias in server (key instead of key * key list) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 00f5bca commit 7d0e701

3 files changed

Lines changed: 4 additions & 3 deletions

File tree

src/irmin-client/client.ml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ struct
255255
request t (module Merge) (old, a, b) |> Error.unwrap "Node.merge"
256256
| Error e -> Error e
257257
in
258-
Irmin.Merge.v Irmin.Type.(option (pair Key.t (list Contents.Key.t))) f
258+
Irmin.Merge.v Irmin.Type.(option Key.t) f
259259
end
260260

261261
module Node_portable = Store.Backend.Node_portable
@@ -391,6 +391,7 @@ struct
391391

392392
let v config = Lwt_eio.run_lwt @@ fun () -> connect config
393393
let config (t : t) = t.Client.config
394+
let inline_contents_max_bytes _ = 0
394395
let close (t : t) = Lwt_eio.run_lwt @@ fun () -> Client.close t
395396
let contents_t (t : t) = t
396397
let node_t (t : t) = t

src/irmin-server/command.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ struct
211211
let value_t = Node.Val.t
212212

213213
type hash = Hash.t
214-
type node_with_inlined = key * Contents.key list [@@deriving irmin]
214+
type node_with_inlined = key [@@deriving irmin]
215215

216216
module Mem = struct
217217
let name = "node.mem"

src/irmin-server/command_intf.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ module type S = sig
9595
type key = Store.Backend.Node.key
9696
type value = Store.Backend.Node.value
9797
type hash = Store.Backend.Node.hash
98-
type node_with_inlined = key * Store.Backend.Contents.key list
98+
type node_with_inlined = key
9999

100100
module Mem : CMD with type req = key and type res = bool
101101
module Find : CMD with type req = key and type res = value option

0 commit comments

Comments
 (0)