refactor(promote): move missing file handling to the command line (#13480)

Signed-off-by: Rudi Grinberg <[email protected]>

Author: rgrinberg

bin/promotion.ml

@@ -11,11 +11,13 @@ let files_to_promote ~common files : Dune_rpc.Files_to_promote.t =
     These files
 ;;
 
-let on_missing fn =
-  User_warning.emit
-    [ Pp.paragraphf "Nothing to promote for %s." (Path.Source.to_string_maybe_quoted fn)
-      |> Pp.tag User_message.Style.Warning
-    ]
+let on_missing missing =
+  List.sort missing ~compare:Path.Source.compare
+  |> List.iter ~f:(fun fn ->
+    User_warning.emit
+      [ Pp.paragraphf "Nothing to promote for %s." (Path.Source.to_string_maybe_quoted fn)
+        |> Pp.tag User_message.Style.Warning
+      ])
 ;;
 
 module Apply = struct
@@ -51,10 +53,7 @@ module Apply = struct
       Scheduler_setup.go_without_rpc_server ~common ~config (fun () ->
         let open Fiber.O in
         let+ () = Fiber.return () in
-        let missing =
-          Diff_promotion.promote_files_registered_in_last_run files_to_promote
-        in
-        List.iter ~f:on_missing missing)
+        Diff_promotion.promote_files_registered_in_last_run files_to_promote |> on_missing)
     | Error lock_held_by ->
       Scheduler_setup.no_build_no_rpc ~config (fun () ->
         let open Fiber.O in
@@ -84,11 +83,11 @@ module Diff = struct
     let files_to_promote = files_to_promote ~common files in
     (* CR-soon rgrinberg: remove pointless args *)
     Scheduler_setup.no_build_no_rpc ~config (fun () ->
-      let open Fiber.O in
       let db = Diff_promotion.load_db () in
-      let all = Diff_promotion.partition_db db files_to_promote in
-      let* missing = Diff_promotion.missing all in
-      List.iter ~f:on_missing missing;
+      let ({ Diff_promotion.present = _; missing } as all) =
+        Diff_promotion.partition_db db files_to_promote
+      in
+      on_missing missing;
       Diff_promotion.display_diffs all)
   ;;
 
@@ -112,8 +111,7 @@ module Files = struct
     let { Diff_promotion.present; missing } =
       Diff_promotion.partition_db db files_to_promote
     in
-    let missing = List.sort missing ~compare:Path.Source.compare in
-    List.iter ~f:on_missing missing;
+    on_missing missing;
     List.sort present ~compare:(fun x y ->
       Path.Source.compare (Diff_promotion.File.source x) (Diff_promotion.File.source y))
     |> List.iter ~f:(fun file ->
@@ -153,11 +151,13 @@ module Show = struct
     let files_to_promote = files_to_promote ~common files in
     (* CR-soon rgrinberg: remove pointless args *)
     Scheduler_setup.no_build_no_rpc ~config (fun () ->
-      let open Fiber.O in
       let db = Diff_promotion.load_db () in
-      let all = Diff_promotion.partition_db db files_to_promote in
-      let+ () = Diff_promotion.missing all >>| List.iter ~f:on_missing in
-      display_corrected_contents db files_to_promote)
+      let { Diff_promotion.present = _; missing } =
+        Diff_promotion.partition_db db files_to_promote
+      in
+      on_missing missing;
+      display_corrected_contents db files_to_promote;
+      Fiber.return ())
   ;;
 
   let command = Cmd.v info term

src/dune_engine/diff_promotion.ml

@@ -270,12 +270,6 @@ let sort_for_display { present; missing } =
   sorted_diffs, sorted_missing
 ;;
 
-let missing all =
-  let open Fiber.O in
-  let+ _diffs, missing = sort_for_display all in
-  missing
-;;
-
 let display_diffs all =
   let open Fiber.O in
   let+ diffs, _missing = sort_for_display all in

src/dune_engine/diff_promotion.mli

@@ -51,9 +51,6 @@ type all =
 val partition_db : db -> Files_to_promote.t -> all
 val promote_files_registered_in_last_run : Files_to_promote.t -> Path.Source.t list
 
-(** [missing db files] returns the list of files in [files] but not in [db]. *)
-val missing : all -> Path.Source.t list Fiber.t
-
 (** [display_diffs db files] will only print the diffs of files that are both
     in [files] and in [db]. *)
 val display_diffs : all -> unit Fiber.t