last_modified: don't find_blob; find the commit! #10
1 changed files with 30 additions and 27 deletions
|
@ -463,12 +463,19 @@ module Make (Pclock : Mirage_clock.PCLOCK) = struct
|
||||||
|
|
||||||
let last_modified t key =
|
let last_modified t key =
|
||||||
let open Lwt.Infix in
|
let open Lwt.Infix in
|
||||||
find_blob t key >>=
|
match t.committed, t.head with
|
||||||
Option.fold
|
| None, None ->
|
||||||
~none:(Lwt.return (Error (`Not_found key)))
|
Lwt.return (Error (`Not_found key))
|
||||||
~some:(fun head ->
|
| Some _, _ ->
|
||||||
Store.read_exn t.store head >|= function
|
Lwt.return_ok
|
||||||
| Commit c ->
|
(Option.fold
|
||||||
|
~none:Ptime.epoch
|
||||||
|
~some:Fun.id (Ptime.of_float_s (Int64.to_float (now ()))))
|
||||||
|
| None, Some head ->
|
||||||
|
(* See https://github.com/ocaml/ocaml/issues/9301 why we have the
|
||||||
|
intermediate [r] value. *)
|
||||||
|
let+ r = Store.read_exn t.store head in
|
||||||
|
let[@warning "-8"] Commit c = r in
|
||||||
let author = Git_commit.author c in
|
let author = Git_commit.author c in
|
||||||
let secs, tz_offset = author.Git.User.date in
|
let secs, tz_offset = author.Git.User.date in
|
||||||
let secs =
|
let secs =
|
||||||
|
@ -486,10 +493,6 @@ module Make (Pclock : Mirage_clock.PCLOCK) = struct
|
||||||
~some:Fun.id (Ptime.of_float_s (Int64.to_float secs))
|
~some:Fun.id (Ptime.of_float_s (Int64.to_float secs))
|
||||||
in
|
in
|
||||||
Ok ts
|
Ok ts
|
||||||
| _ ->
|
|
||||||
Ok (Option.fold
|
|
||||||
~none:Ptime.epoch
|
|
||||||
~some:Fun.id (Ptime.of_float_s (Int64.to_float (now ())))))
|
|
||||||
|
|
||||||
let digest t key =
|
let digest t key =
|
||||||
let open Lwt.Infix in
|
let open Lwt.Infix in
|
||||||
|
|
Loading…
Reference in a new issue