From 5f3a2f4c6bbf276e862dfa4e9c5018466a913848 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 9 Sep 2024 11:06:42 -0400 Subject: [PATCH] set descriptions for all simulated repos --- Annex/Sim.hs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Annex/Sim.hs b/Annex/Sim.hs index 27f2ca01f7..9a3984d56f 100644 --- a/Annex/Sim.hs +++ b/Annex/Sim.hs @@ -30,6 +30,7 @@ import Logs.NumCopies import Logs.Remote import Logs.MaxSize import Logs.Difference +import Logs.UUID import qualified Annex import qualified Remote import qualified Git.Construct @@ -482,7 +483,7 @@ cloneSimRepo simreponame u parent dest st = do -- avoids checkSharedClone enabling the shared clone -- setting, which is not wanted here. recordDifferences simulationDifferences u - let desc = "simulated repository " ++ fromRepoName simreponame + let desc = simulatedRepositoryDescription simreponame initialize startupAnnex (Just desc) Nothing updateSimRepoState st $ SimRepo { simRepoGitRepo = simrepo @@ -492,6 +493,10 @@ cloneSimRepo simreponame u parent dest st = do (simGetExistingRepoByName st) } +simulatedRepositoryDescription :: RepoName -> String +simulatedRepositoryDescription simreponame = + "simulated repository " ++ fromRepoName simreponame + simulationDifferences :: Differences simulationDifferences = mkDifferences $ S.singleton Simulation @@ -499,6 +504,13 @@ updateSimRepoState :: SimState -> SimRepo -> IO SimRepo updateSimRepoState newst sr = do ((), (ast, ard)) <- Annex.run (simRepoAnnex sr) $ doQuietAction $ do let oldst = simRepoCurrState sr + let setdesc = \r u -> describeUUID u $ toUUIDDesc $ + simulatedRepositoryDescription r + updateField oldst newst simRepos $ DiffUpdate + { replaceDiff = setdesc + , addDiff = setdesc + , removeDiff = const noop + } updateField oldst newst simTrustLevels $ DiffUpdate { replaceDiff = trustSet , addDiff = trustSet