ocaml-git: add commit and rm functions with tests

Add high-level commit function that reads author from git config,
and rm function for removing files from index and working tree.
Includes comprehensive tests for both functions.

lib/repository.ml

···
       advance_head t commit_hash;
       Ok commit_hash
 
+let commit t ~message =
+  (* Get user info from config *)
+  match read_config t with
+  | None -> Error (`Msg "no git config found")
+  | Some config -> (
+      let user_config = Config.get_user config in
+      match (user_config.name, user_config.email) with
+      | None, _ -> Error (`Msg "user.name not set in git config")
+      | _, None -> Error (`Msg "user.email not set in git config")
+      | Some name, Some email ->
+          let date = Int64.of_float (Unix.gettimeofday ()) in
+          let user = User.v ~name ~email ~date () in
+          commit_index t ~author:user ~committer:user ~message ())
+
+let rm t ~recursive path =
+  let work_dir =
+    if
+      String.length t.git_dir > 5
+      && String.sub t.git_dir (String.length t.git_dir - 5) 5 = "/.git"
+    then String.sub t.git_dir 0 (String.length t.git_dir - 5)
+    else Filename.dirname t.git_dir
+  in
+  (* Remove from index *)
+  (match read_index t with
+  | Error _ -> ()
+  | Ok index ->
+      let new_index =
+        if recursive then
+          (* Remove all entries under this path *)
+          let prefix = if path = "" then "" else path ^ "/" in
+          List.fold_left
+            (fun idx (entry : Index.entry) ->
+              if entry.name = path || String.starts_with ~prefix entry.name then
+                Index.remove idx entry.name
+              else idx)
+            index (Index.entries index)
+        else Index.remove index path
+      in
+      write_index t new_index);
+  (* Remove from working tree *)
+  let full_path = Eio.Path.(t.fs / work_dir / path) in
+  (try
+     if recursive then
+       let rec remove_recursive p =
+         match Eio.Path.kind ~follow:false p with
+         | `Directory ->
+             let entries = Eio.Path.read_dir p in
+             List.iter
+               (fun name -> remove_recursive Eio.Path.(p / name))
+               entries;
+             Eio.Path.rmdir p
+         | _ -> Eio.Path.unlink p
+       in
+       remove_recursive full_path
+     else Eio.Path.unlink full_path
+   with Eio.Io _ -> ());
+  Ok ()
+
 (** {1 Checkout operations} *)
 
 let rec checkout_tree t ~work_dir ~prefix tree_hash =

lib/repository.mli

···
 (** [add_all t] stages all changes in the working directory (equivalent to
     [git add -A]). Adds new and modified files, removes deleted files. *)
 
+val commit : t -> message:string -> (Hash.t, [ `Msg of string ]) result
+(** [commit t ~message] creates a commit from the current index using the
+    author/committer from git config. Returns the commit hash. *)
+
+val rm : t -> recursive:bool -> string -> (unit, [ `Msg of string ]) result
+(** [rm t ~recursive path] removes [path] from the index and working tree. If
+    [recursive] is true, removes all entries under [path]. *)
+
 val commit_index :
   t ->
   author:User.t ->

test/test_repository.ml

···
 let hash = Test_common.hash
 let with_temp_repo = Test_common.with_temp_repo
 let make_commit = Test_common.make_commit
+let unwrap = function Ok x -> x | Error (`Msg e) -> Alcotest.fail e
+
+let string_contains ~needle haystack =
+  let n = String.length needle in
+  let h = String.length haystack in
+  if n > h then false
+  else
+    let rec check i =
+      if i + n > h then false
+      else if String.sub haystack i n = needle then true
+      else check (i + 1)
+    in
+    check 0
 
 (* Basic repository tests *)
 
···
   Alcotest.(check bool)
     "no history" false
     (Git.Repository.has_subtree_history repo ~prefix:"nonexistent")
+
+(* add_all tests *)
+
+let test_add_all_new_file () =
+  with_temp_repo @@ fun fs tmp_dir ->
+  let repo = Git.Repository.init ~fs tmp_dir in
+  let work_dir = Eio.Path.(fs / Fpath.to_string tmp_dir) in
+  Eio.Path.save ~create:(`Or_truncate 0o644)
+    Eio.Path.(work_dir / "test.txt")
+    "hello";
+  unwrap (Git.Repository.add_all repo);
+  let idx = unwrap (Git.Repository.read_index repo) in
+  let entries = Git.Index.entries idx in
+  Alcotest.(check int) "one entry" 1 (List.length entries);
+  Alcotest.(check string) "name" "test.txt" (List.hd entries).name
+
+let test_add_all_nested_dirs () =
+  with_temp_repo @@ fun fs tmp_dir ->
+  let repo = Git.Repository.init ~fs tmp_dir in
+  let work_dir = Eio.Path.(fs / Fpath.to_string tmp_dir) in
+  Eio.Path.mkdir ~perm:0o755 Eio.Path.(work_dir / "src");
+  Eio.Path.mkdir ~perm:0o755 Eio.Path.(work_dir / "src" / "lib");
+  Eio.Path.save ~create:(`Or_truncate 0o644)
+    Eio.Path.(work_dir / "src" / "lib" / "foo.ml")
+    "let x = 1";
+  Eio.Path.save ~create:(`Or_truncate 0o644)
+    Eio.Path.(work_dir / "src" / "main.ml")
+    "let () = ()";
+  unwrap (Git.Repository.add_all repo);
+  let idx = unwrap (Git.Repository.read_index repo) in
+  let entries = Git.Index.entries idx in
+  Alcotest.(check int) "two entries" 2 (List.length entries);
+  let names = List.map (fun (e : Git.Index.entry) -> e.name) entries in
+  Alcotest.(check bool) "has foo.ml" true (List.mem "src/lib/foo.ml" names);
+  Alcotest.(check bool) "has main.ml" true (List.mem "src/main.ml" names)
+
+let test_add_all_removes_deleted () =
+  with_temp_repo @@ fun fs tmp_dir ->
+  let repo = Git.Repository.init ~fs tmp_dir in
+  let work_dir = Eio.Path.(fs / Fpath.to_string tmp_dir) in
+  Eio.Path.save ~create:(`Or_truncate 0o644)
+    Eio.Path.(work_dir / "file.txt")
+    "content";
+  unwrap (Git.Repository.add_all repo);
+  Eio.Path.unlink Eio.Path.(work_dir / "file.txt");
+  unwrap (Git.Repository.add_all repo);
+  let idx = unwrap (Git.Repository.read_index repo) in
+  Alcotest.(check int) "no entries" 0 (List.length (Git.Index.entries idx))
+
+let test_add_all_updates_modified () =
+  with_temp_repo @@ fun fs tmp_dir ->
+  let repo = Git.Repository.init ~fs tmp_dir in
+  let work_dir = Eio.Path.(fs / Fpath.to_string tmp_dir) in
+  Eio.Path.save ~create:(`Or_truncate 0o644)
+    Eio.Path.(work_dir / "file.txt")
+    "v1";
+  unwrap (Git.Repository.add_all repo);
+  let hash1 =
+    (List.hd (Git.Index.entries (unwrap (Git.Repository.read_index repo)))).hash
+  in
+  Eio.Path.save ~create:(`Or_truncate 0o644)
+    Eio.Path.(work_dir / "file.txt")
+    "v2";
+  unwrap (Git.Repository.add_all repo);
+  let hash2 =
+    (List.hd (Git.Index.entries (unwrap (Git.Repository.read_index repo)))).hash
+  in
+  Alcotest.(check bool) "hash changed" false (Git.Hash.equal hash1 hash2)
+
+let test_add_all_ignores_git_dir () =
+  with_temp_repo @@ fun fs tmp_dir ->
+  let repo = Git.Repository.init ~fs tmp_dir in
+  let work_dir = Eio.Path.(fs / Fpath.to_string tmp_dir) in
+  Eio.Path.save ~create:(`Or_truncate 0o644)
+    Eio.Path.(work_dir / ".git" / "test")
+    "ignored";
+  Eio.Path.save ~create:(`Or_truncate 0o644)
+    Eio.Path.(work_dir / "normal.txt")
+    "included";
+  unwrap (Git.Repository.add_all repo);
+  let idx = unwrap (Git.Repository.read_index repo) in
+  let entries = Git.Index.entries idx in
+  Alcotest.(check int) "one entry" 1 (List.length entries);
+  Alcotest.(check string) "only normal.txt" "normal.txt" (List.hd entries).name
+
+(* commit tests *)
+
+let setup_config repo =
+  let config =
+    Git.Config.(
+      empty
+      |> set ~section:(section "user") ~key:"name" ~value:"Test User"
+      |> set ~section:(section "user") ~key:"email" ~value:"[e-mail]")
+  in
+  Git.Repository.write_config repo config
+
+let test_commit_basic () =
+  with_temp_repo @@ fun fs tmp_dir ->
+  let repo = Git.Repository.init ~fs tmp_dir in
+  setup_config repo;
+  let work_dir = Eio.Path.(fs / Fpath.to_string tmp_dir) in
+  Eio.Path.save ~create:(`Or_truncate 0o644)
+    Eio.Path.(work_dir / "file.txt")
+    "content";
+  (match Git.Repository.add_all repo with
+  | Error (`Msg e) -> Alcotest.fail e
+  | Ok () -> ());
+  match Git.Repository.commit repo ~message:"Initial commit" with
+  | Error (`Msg e) -> Alcotest.fail e
+  | Ok hash -> (
+      (* Verify commit exists *)
+      match Git.Repository.read repo hash with
+      | Error (`Msg e) -> Alcotest.fail e
+      | Ok (Git.Value.Commit c) ->
+          Alcotest.(check (option string))
+            "message" (Some "Initial commit") (Git.Commit.message c);
+          Alcotest.(check string)
+            "author" "Test User"
+            (Git.User.name (Git.Commit.author c))
+      | Ok _ -> Alcotest.fail "expected commit")
+
+let test_commit_updates_head () =
+  with_temp_repo @@ fun fs tmp_dir ->
+  let repo = Git.Repository.init ~fs tmp_dir in
+  setup_config repo;
+  let work_dir = Eio.Path.(fs / Fpath.to_string tmp_dir) in
+  Eio.Path.save ~create:(`Or_truncate 0o644)
+    Eio.Path.(work_dir / "file.txt")
+    "content";
+  (match Git.Repository.add_all repo with
+  | Error (`Msg e) -> Alcotest.fail e
+  | Ok () -> ());
+  match Git.Repository.commit repo ~message:"test" with
+  | Error (`Msg e) -> Alcotest.fail e
+  | Ok commit_hash ->
+      Alcotest.(check (option hash))
+        "HEAD updated" (Some commit_hash) (Git.Repository.head repo)
+
+let test_commit_no_config () =
+  with_temp_repo @@ fun fs tmp_dir ->
+  let repo = Git.Repository.init ~fs tmp_dir in
+  let work_dir = Eio.Path.(fs / Fpath.to_string tmp_dir) in
+  Eio.Path.save ~create:(`Or_truncate 0o644)
+    Eio.Path.(work_dir / "file.txt")
+    "content";
+  (match Git.Repository.add_all repo with
+  | Error (`Msg e) -> Alcotest.fail e
+  | Ok () -> ());
+  match Git.Repository.commit repo ~message:"test" with
+  | Error (`Msg msg) ->
+      Alcotest.(check bool) "error mentions config" true (String.length msg > 0)
+  | Ok _ -> Alcotest.fail "expected error"
+
+let test_commit_no_user_name () =
+  with_temp_repo @@ fun fs tmp_dir ->
+  let repo = Git.Repository.init ~fs tmp_dir in
+  (* Set only email, not name *)
+  let config =
+    Git.Config.(
+      empty |> set ~section:(section "user") ~key:"email" ~value:"[e-mail]")
+  in
+  Git.Repository.write_config repo config;
+  let work_dir = Eio.Path.(fs / Fpath.to_string tmp_dir) in
+  Eio.Path.save ~create:(`Or_truncate 0o644)
+    Eio.Path.(work_dir / "file.txt")
+    "content";
+  (match Git.Repository.add_all repo with
+  | Error (`Msg e) -> Alcotest.fail e
+  | Ok () -> ());
+  match Git.Repository.commit repo ~message:"test" with
+  | Error (`Msg msg) ->
+      Alcotest.(check bool)
+        "error mentions user.name" true
+        (string_contains ~needle:"user.name" msg)
+  | Ok _ -> Alcotest.fail "expected error"
+
+let test_commit_multiple () =
+  with_temp_repo @@ fun fs tmp_dir ->
+  let repo = Git.Repository.init ~fs tmp_dir in
+  setup_config repo;
+  let work_dir = Eio.Path.(fs / Fpath.to_string tmp_dir) in
+  (* First commit *)
+  Eio.Path.save ~create:(`Or_truncate 0o644)
+    Eio.Path.(work_dir / "file.txt")
+    "v1";
+  (match Git.Repository.add_all repo with
+  | Error (`Msg e) -> Alcotest.fail e
+  | Ok () -> ());
+  let hash1 =
+    match Git.Repository.commit repo ~message:"c1" with
+    | Error (`Msg e) -> Alcotest.fail e
+    | Ok h -> h
+  in
+  (* Second commit *)
+  Eio.Path.save ~create:(`Or_truncate 0o644)
+    Eio.Path.(work_dir / "file.txt")
+    "v2";
+  (match Git.Repository.add_all repo with
+  | Error (`Msg e) -> Alcotest.fail e
+  | Ok () -> ());
+  let hash2 =
+    match Git.Repository.commit repo ~message:"c2" with
+    | Error (`Msg e) -> Alcotest.fail e
+    | Ok h -> h
+  in
+  (* Verify parent *)
+  match Git.Repository.read repo hash2 with
+  | Error (`Msg e) -> Alcotest.fail e
+  | Ok (Git.Value.Commit c) ->
+      Alcotest.(check (list hash)) "parent" [ hash1 ] (Git.Commit.parents c)
+  | Ok _ -> Alcotest.fail "expected commit"
+
+(* rm tests *)
+
+let test_rm_single_file () =
+  with_temp_repo @@ fun fs tmp_dir ->
+  let repo = Git.Repository.init ~fs tmp_dir in
+  let work_dir = Eio.Path.(fs / Fpath.to_string tmp_dir) in
+  (* Create and stage files *)
+  Eio.Path.save ~create:(`Or_truncate 0o644)
+    Eio.Path.(work_dir / "keep.txt")
+    "keep";
+  Eio.Path.save ~create:(`Or_truncate 0o644)
+    Eio.Path.(work_dir / "delete.txt")
+    "delete";
+  (match Git.Repository.add_all repo with
+  | Error (`Msg e) -> Alcotest.fail e
+  | Ok () -> ());
+  (* Remove one file *)
+  (match Git.Repository.rm repo ~recursive:false "delete.txt" with
+  | Error (`Msg e) -> Alcotest.fail e
+  | Ok () -> ());
+  (* Check index *)
+  (match Git.Repository.read_index repo with
+  | Error (`Msg e) -> Alcotest.fail e
+  | Ok idx ->
+      let entries = Git.Index.entries idx in
+      Alcotest.(check int) "one entry" 1 (List.length entries);
+      Alcotest.(check string) "keep.txt" "keep.txt" (List.hd entries).name);
+  (* Check working tree *)
+  Alcotest.(check bool)
+    "file deleted" false
+    (Eio.Path.is_file Eio.Path.(work_dir / "delete.txt"))
+
+let test_rm_recursive () =
+  with_temp_repo @@ fun fs tmp_dir ->
+  let repo = Git.Repository.init ~fs tmp_dir in
+  let work_dir = Eio.Path.(fs / Fpath.to_string tmp_dir) in
+  (* Create nested structure *)
+  Eio.Path.mkdir ~perm:0o755 Eio.Path.(work_dir / "dir");
+  Eio.Path.save ~create:(`Or_truncate 0o644)
+    Eio.Path.(work_dir / "dir" / "a.txt")
+    "a";
+  Eio.Path.save ~create:(`Or_truncate 0o644)
+    Eio.Path.(work_dir / "dir" / "b.txt")
+    "b";
+  Eio.Path.save ~create:(`Or_truncate 0o644)
+    Eio.Path.(work_dir / "keep.txt")
+    "keep";
+  (match Git.Repository.add_all repo with
+  | Error (`Msg e) -> Alcotest.fail e
+  | Ok () -> ());
+  (* Remove directory *)
+  (match Git.Repository.rm repo ~recursive:true "dir" with
+  | Error (`Msg e) -> Alcotest.fail e
+  | Ok () -> ());
+  (* Check index *)
+  (match Git.Repository.read_index repo with
+  | Error (`Msg e) -> Alcotest.fail e
+  | Ok idx ->
+      let entries = Git.Index.entries idx in
+      Alcotest.(check int) "one entry" 1 (List.length entries);
+      Alcotest.(check string) "keep.txt" "keep.txt" (List.hd entries).name);
+  (* Check working tree *)
+  Alcotest.(check bool)
+    "dir deleted" false
+    (Eio.Path.is_directory Eio.Path.(work_dir / "dir"))
+
+let test_rm_preserves_others () =
+  with_temp_repo @@ fun fs tmp_dir ->
+  let repo = Git.Repository.init ~fs tmp_dir in
+  let work_dir = Eio.Path.(fs / Fpath.to_string tmp_dir) in
+  (* Create files with similar prefixes *)
+  Eio.Path.save ~create:(`Or_truncate 0o644)
+    Eio.Path.(work_dir / "foo.txt")
+    "foo";
+  Eio.Path.save ~create:(`Or_truncate 0o644)
+    Eio.Path.(work_dir / "foobar.txt")
+    "foobar";
+  (match Git.Repository.add_all repo with
+  | Error (`Msg e) -> Alcotest.fail e
+  | Ok () -> ());
+  (* Remove only foo.txt *)
+  (match Git.Repository.rm repo ~recursive:false "foo.txt" with
+  | Error (`Msg e) -> Alcotest.fail e
+  | Ok () -> ());
+  (* Check index still has foobar.txt *)
+  match Git.Repository.read_index repo with
+  | Error (`Msg e) -> Alcotest.fail e
+  | Ok idx ->
+      let entries = Git.Index.entries idx in
+      Alcotest.(check int) "one entry" 1 (List.length entries);
+      Alcotest.(check string) "foobar.txt" "foobar.txt" (List.hd entries).name
+
+let test_rm_nonexistent () =
+  with_temp_repo @@ fun fs tmp_dir ->
+  let repo = Git.Repository.init ~fs tmp_dir in
+  (* Remove nonexistent file (should succeed silently) *)
+  match Git.Repository.rm repo ~recursive:false "nonexistent.txt" with
+  | Error (`Msg e) -> Alcotest.fail ("unexpected error: " ^ e)
+  | Ok () -> ()
 
 let tests =
   [