Refactor lock warning to eliminate code duplication

Extract the warning message generation into a helper function to avoid
repeating the same logic for both the timeout and no-timeout cases. This
makes the code more maintainable and easier to read.

Signed-off-by: sabine <[email protected]>

Author: sabine

src/dune_util/global_lock.ml

@@ -90,6 +90,26 @@ module Lock_held_by = struct
   ;;
 end
 
+let emit_lock_warning lock_held_by =
+  let pid_suffix =
+    match lock_held_by with
+    | Lock_held_by.Unknown -> ""
+    | Pid_from_lockfile pid -> sprintf " (pid: %d)" pid
+  in
+  let condition =
+    match lock_held_by with
+    | Pid_from_lockfile _ -> "If this process is no longer running"
+    | Unknown -> "If no other dune process is running"
+  in
+  User_warning.emit
+    [ Pp.textf
+        "Build directory is locked by another dune process%s. Waiting for the lock to be \
+         released..."
+        pid_suffix
+    ; Pp.textf "%s, delete the lock file: %s" condition (Path.Build.to_string lock_file)
+    ]
+;;
+
 let lock ~timeout =
   match Config.(get global_lock) with
   | `Disabled -> Ok ()
@@ -103,26 +123,7 @@ let lock ~timeout =
           (match Lock.lock () with
            | `Success -> `Success
            | `Failure ->
-             let lock_held_by = Lock_held_by.read_lock_file () in
-             User_warning.emit
-               ([ Pp.textf
-                    "Build directory is locked by another dune process%s. Waiting for the \
-                     lock to be released..."
-                    (match lock_held_by with
-                     | Unknown -> ""
-                     | Pid_from_lockfile pid -> sprintf " (pid: %d)" pid)
-                ]
-                @ (match lock_held_by with
-                   | Pid_from_lockfile _ ->
-                     [ Pp.textf
-                         "If this process is no longer running, delete the lock file: %s"
-                         (Path.Build.to_string lock_file)
-                     ]
-                   | Unknown ->
-                     [ Pp.textf
-                         "If no other dune process is running, delete the lock file: %s"
-                         (Path.Build.to_string lock_file)
-                     ]));
+             emit_lock_warning (Lock_held_by.read_lock_file ());
              `Failure)
         | Some timeout ->
           let warned = ref false in
@@ -131,30 +132,11 @@ let lock ~timeout =
                match Lock.lock () with
                | `Success -> `Stop
                | `Failure ->
-                  if not !warned
-                  then (
-                    warned := true;
-                    let lock_held_by = Lock_held_by.read_lock_file () in
-                    User_warning.emit
-                      ([ Pp.textf
-                           "Build directory is locked by another dune process%s. Waiting for \
-                            the lock to be released..."
-                           (match lock_held_by with
-                            | Unknown -> ""
-                            | Pid_from_lockfile pid -> sprintf " (pid: %d)" pid)
-                       ]
-                       @ (match lock_held_by with
-                          | Pid_from_lockfile _ ->
-                            [ Pp.textf
-                                "If this process is no longer running, delete the lock file: %s"
-                                (Path.Build.to_string lock_file)
-                            ]
-                          | Unknown ->
-                            [ Pp.textf
-                                "If no other dune process is running, delete the lock file: %s"
-                                (Path.Build.to_string lock_file)
-                            ])));
-                  `Continue)
+                 if not !warned
+                 then (
+                   warned := true;
+                   emit_lock_warning (Lock_held_by.read_lock_file ()));
+                 `Continue)
            with
            | `Timed_out -> `Failure
            | `Success -> `Success)