Merge pull request #6075 from unisonweb/arya/tweak-cache-key

aryairani · web-flow · commit ee18126d68ef · 2025-12-20T21:03:51.000-07:00
diff --git a/parser-typechecker/src/Unison/Codebase/Init.hs b/parser-typechecker/src/Unison/Codebase/Init.hs
@@ -49,6 +49,8 @@ data SpecifiedCodebase
 data CodebaseLockOption
   = DoLock
   | DontLock
+  | BlockUntilLock
+  deriving stock (Show)
 
 data BackupStrategy
   = -- Create a backup of the codebase in the same directory as the codebase,
diff --git a/parser-typechecker/src/Unison/Codebase/SqliteCodebase.hs b/parser-typechecker/src/Unison/Codebase/SqliteCodebase.hs
@@ -14,7 +14,7 @@ import Data.Either.Extra ()
 import Data.Foldable qualified as Foldable
 import Data.Map qualified as Map
 import Data.Set qualified as Set
-import System.FileLock (SharedExclusive (Exclusive), withTryFileLock)
+import System.FileLock (SharedExclusive (Exclusive), withFileLock, withTryFileLock)
 import U.Codebase.HashTags (BranchHash, CausalHash)
 import U.Codebase.Sqlite.Operations qualified as Operations
 import Unison.Codebase (Codebase, CodebasePath)
@@ -322,6 +322,12 @@ sqliteCodebase debugName root localOrRemote lockOption migrationStrategy action
         withTryFileLock (lockfilePath root) Exclusive (\_flock -> runInIO ma) <&> \case
           Nothing -> Left OpenCodebaseFileLockFailed
           Just x -> x
+      BlockUntilLock -> withRunInIO \runInIO ->
+        withTryFileLock (lockfilePath root) Exclusive (\_flock -> runInIO ma) >>= \case
+          Nothing -> do
+            liftIO (putStrLn "Waiting for codebase lock...")
+            withFileLock (lockfilePath root) Exclusive (\_flock -> runInIO ma)
+          Just x -> pure x
 
 ensureMigrated ::
   (MonadUnliftIO m) =>
diff --git a/unison-cli/src/Unison/Main.hs b/unison-cli/src/Unison/Main.hs
@@ -515,7 +515,7 @@ runTranscripts' version progName transcriptDir markdownFiles = do
   and
     <$> getCodebaseOrExit
       (Just (DontCreateCodebaseWhenMissing transcriptDir))
-      SC.DoLock
+      SC.BlockUntilLock
       (SC.MigrateAutomatically SC.Backup SC.Vacuum)
       \(_, codebasePath, theCodebase) -> do
         let isTest = False
