summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Annex/Branch/Transitions.hs6
-rw-r--r--Logs.hs10
-rw-r--r--Logs/Activity.hs6
-rw-r--r--Logs/ContentIdentifier.hs2
-rw-r--r--Logs/ContentIdentifier/Pure.hs12
-rw-r--r--Logs/Difference.hs4
-rw-r--r--Logs/Difference/Pure.hs2
-rw-r--r--Logs/Group.hs5
-rw-r--r--Logs/Multicast.hs6
-rw-r--r--Logs/PreferredContent.hs2
-rw-r--r--Logs/PreferredContent/Raw.hs8
-rw-r--r--Logs/Remote.hs6
-rw-r--r--Logs/Schedule.hs6
-rw-r--r--Logs/Trust/Basic.hs4
-rw-r--r--Logs/Trust/Pure.hs2
-rw-r--r--Logs/UUID.hs4
-rw-r--r--Logs/UUIDBased.hs28
17 files changed, 56 insertions, 57 deletions
diff --git a/Annex/Branch/Transitions.hs b/Annex/Branch/Transitions.hs
index 6a7b16d159..5595be2ed1 100644
--- a/Annex/Branch/Transitions.hs
+++ b/Annex/Branch/Transitions.hs
@@ -40,15 +40,15 @@ getTransitionCalculator ForgetDeadRemotes = Just dropDead
dropDead :: FilePath -> L.ByteString -> TrustMap -> FileTransition
dropDead f content trustmap = case getLogVariety f of
- Just UUIDBasedLog
+ Just OldUUIDBasedLog
-- Don't remove the dead repo from the trust log,
-- because git remotes may still exist, and they need
-- to still know it's dead.
| f == trustLog -> PreserveFile
| otherwise -> ChangeFile $
- UUIDBased.buildLog byteString $
+ UUIDBased.buildLogOld byteString $
dropDeadFromMapLog trustmap id $
- UUIDBased.parseLog A.takeByteString content
+ UUIDBased.parseLogOld A.takeByteString content
Just NewUUIDBasedLog -> ChangeFile $
UUIDBased.buildLogNew byteString $
dropDeadFromMapLog trustmap id $
diff --git a/Logs.hs b/Logs.hs
index 2bced05608..2122079284 100644
--- a/Logs.hs
+++ b/Logs.hs
@@ -12,7 +12,7 @@ import Annex.DirHashes
{- There are several varieties of log file formats. -}
data LogVariety
- = UUIDBasedLog
+ = OldUUIDBasedLog
| NewUUIDBasedLog
| ChunkLog Key
| PresenceLog Key
@@ -24,16 +24,16 @@ data LogVariety
- of logs used by git-annex, if it's a known path. -}
getLogVariety :: FilePath -> Maybe LogVariety
getLogVariety f
- | f `elem` topLevelUUIDBasedLogs = Just UUIDBasedLog
+ | f `elem` topLevelOldUUIDBasedLogs = Just OldUUIDBasedLog
| isRemoteStateLog f || isRemoteContentIdentifierLog f = Just NewUUIDBasedLog
| isChunkLog f = ChunkLog <$> chunkLogFileKey f
| isRemoteMetaDataLog f = Just RemoteMetaDataLog
| isMetaDataLog f || f `elem` otherLogs = Just OtherLog
| otherwise = PresenceLog <$> firstJust (presenceLogs f)
-{- All the uuid-based logs stored in the top of the git-annex branch. -}
-topLevelUUIDBasedLogs :: [FilePath]
-topLevelUUIDBasedLogs =
+{- All the (old-format) uuid-based logs stored in the top of the git-annex branch. -}
+topLevelOldUUIDBasedLogs :: [FilePath]
+topLevelOldUUIDBasedLogs =
[ uuidLog
, remoteLog
, trustLog
diff --git a/Logs/Activity.hs b/Logs/Activity.hs
index f49257e181..9286599af0 100644
--- a/Logs/Activity.hs
+++ b/Logs/Activity.hs
@@ -29,12 +29,12 @@ recordActivity :: Activity -> UUID -> Annex ()
recordActivity act uuid = do
c <- liftIO currentVectorClock
Annex.Branch.change activityLog $
- buildLog buildActivity
+ buildLogOld buildActivity
. changeLog c uuid (Right act)
- . parseLog parseActivity
+ . parseLogOld parseActivity
lastActivities :: Maybe Activity -> Annex (Log Activity)
-lastActivities wantact = parseLog (onlywanted =<< parseActivity)
+lastActivities wantact = parseLogOld (onlywanted =<< parseActivity)
<$> Annex.Branch.get activityLog
where
onlywanted (Right a) | wanted a = pure a
diff --git a/Logs/ContentIdentifier.hs b/Logs/ContentIdentifier.hs
index 5ce4ec3b61..1a0f29021b 100644
--- a/Logs/ContentIdentifier.hs
+++ b/Logs/ContentIdentifier.hs
@@ -14,7 +14,7 @@ module Logs.ContentIdentifier (
import Annex.Common
import Logs
import Logs.MapLog
-import Types.Remote (ContentIdentifier)
+import Types.Import
import qualified Annex.Branch
import Logs.ContentIdentifier.Pure as X
import qualified Annex
diff --git a/Logs/ContentIdentifier/Pure.hs b/Logs/ContentIdentifier/Pure.hs
index ee45f61ef0..5eea475d7f 100644
--- a/Logs/ContentIdentifier/Pure.hs
+++ b/Logs/ContentIdentifier/Pure.hs
@@ -10,8 +10,8 @@
module Logs.ContentIdentifier.Pure where
import Annex.Common
-import Logs.MapLog
-import Types.Remote (ContentIdentifier(..))
+import Logs.UUIDBased
+import Types.Import
import Utility.Base64
import qualified Data.ByteString as S
@@ -21,10 +21,10 @@ import qualified Data.Attoparsec.ByteString.Lazy as A
import qualified Data.Attoparsec.ByteString.Char8 as A8
import Data.ByteString.Builder
-type ContentIdentifierLog = MapLog UUID [ContentIdentifier]
+type ContentIdentifierLog = Log [ContentIdentifier]
buildLog :: ContentIdentifierLog -> Builder
-buildLog = buildMapLog buildUUID buildContentIdentifierList
+buildLog = buildLogNew buildContentIdentifierList
buildContentIdentifierList :: [ContentIdentifier] -> Builder
buildContentIdentifierList l = case l of
@@ -38,9 +38,7 @@ buildContentIdentifierList l = case l of
| otherwise = byteString c
parseLog :: L.ByteString -> ContentIdentifierLog
-parseLog = parseMapLog
- (toUUID <$> A.takeByteString)
- parseContentIdentifierList
+parseLog = parseLogNew parseContentIdentifierList
parseContentIdentifierList :: A.Parser [ContentIdentifier]
parseContentIdentifierList = reverse . catMaybes <$> valueparser []
diff --git a/Logs/Difference.hs b/Logs/Difference.hs
index e59a485f5b..fecddc305f 100644
--- a/Logs/Difference.hs
+++ b/Logs/Difference.hs
@@ -27,9 +27,9 @@ recordDifferences :: Differences -> UUID -> Annex ()
recordDifferences ds@(Differences {}) uuid = do
c <- liftIO currentVectorClock
Annex.Branch.change differenceLog $
- buildLog byteString
+ buildLogOld byteString
. changeLog c uuid (encodeBS $ showDifferences ds)
- . parseLog A.takeByteString
+ . parseLogOld A.takeByteString
recordDifferences UnknownDifferences _ = return ()
-- Map of UUIDs that have Differences recorded.
diff --git a/Logs/Difference/Pure.hs b/Logs/Difference/Pure.hs
index 8c8c484257..663e3a6139 100644
--- a/Logs/Difference/Pure.hs
+++ b/Logs/Difference/Pure.hs
@@ -20,7 +20,7 @@ import Logs.UUIDBased
parseDifferencesLog :: L.ByteString -> (M.Map UUID Differences)
parseDifferencesLog = simpleMap
- . parseLog (readDifferences . decodeBS <$> A.takeByteString)
+ . parseLogOld (readDifferences . decodeBS <$> A.takeByteString)
-- The sum of all recorded differences, across all UUIDs.
allDifferences :: M.Map UUID Differences -> Differences
diff --git a/Logs/Group.hs b/Logs/Group.hs
index d216f591df..022a6c36e3 100644
--- a/Logs/Group.hs
+++ b/Logs/Group.hs
@@ -40,7 +40,7 @@ groupChange uuid@(UUID _) modifier = do
curr <- lookupGroups uuid
c <- liftIO currentVectorClock
Annex.Branch.change groupLog $
- buildLog buildGroup . changeLog c uuid (modifier curr) . parseLog parseGroup
+ buildLogOld buildGroup . changeLog c uuid (modifier curr) . parseLogOld parseGroup
-- The changed group invalidates the preferred content cache.
Annex.changeState $ \s -> s
@@ -76,7 +76,8 @@ groupMap = maybe groupMapLoad return =<< Annex.getState Annex.groupmap
{- Loads the map, updating the cache. -}
groupMapLoad :: Annex GroupMap
groupMapLoad = do
- m <- makeGroupMap . simpleMap . parseLog parseGroup <$> Annex.Branch.get groupLog
+ m <- makeGroupMap . simpleMap . parseLogOld parseGroup
+ <$> Annex.Branch.get groupLog
Annex.changeState $ \s -> s { Annex.groupmap = Just m }
return m
diff --git a/Logs/Multicast.hs b/Logs/Multicast.hs
index 41ebe3f20d..b3e8ee7056 100644
--- a/Logs/Multicast.hs
+++ b/Logs/Multicast.hs
@@ -27,12 +27,12 @@ recordFingerprint :: Fingerprint -> UUID -> Annex ()
recordFingerprint fp uuid = do
c <- liftIO currentVectorClock
Annex.Branch.change multicastLog $
- buildLog buildFindgerPrint
+ buildLogOld buildFindgerPrint
. changeLog c uuid fp
- . parseLog fingerprintParser
+ . parseLogOld fingerprintParser
knownFingerPrints :: Annex (M.Map UUID Fingerprint)
-knownFingerPrints = simpleMap . parseLog fingerprintParser
+knownFingerPrints = simpleMap . parseLogOld fingerprintParser
<$> Annex.Branch.get activityLog
fingerprintParser :: A.Parser Fingerprint
diff --git a/Logs/PreferredContent.hs b/Logs/PreferredContent.hs
index 8229bf36ec..aad2f6d5a2 100644
--- a/Logs/PreferredContent.hs
+++ b/Logs/PreferredContent.hs
@@ -74,7 +74,7 @@ preferredRequiredMapsLoad = do
groupmap <- groupMap
configmap <- readRemoteLog
let genmap l gm = simpleMap
- . parseLogWithUUID (\u -> makeMatcher groupmap configmap gm u . decodeBS <$> A.takeByteString)
+ . parseLogOldWithUUID (\u -> makeMatcher groupmap configmap gm u . decodeBS <$> A.takeByteString)
<$> Annex.Branch.get l
pc <- genmap preferredContentLog =<< groupPreferredContentMapRaw
rc <- genmap requiredContentLog M.empty
diff --git a/Logs/PreferredContent/Raw.hs b/Logs/PreferredContent/Raw.hs
index 81fb49d44a..98e17cf77c 100644
--- a/Logs/PreferredContent/Raw.hs
+++ b/Logs/PreferredContent/Raw.hs
@@ -32,9 +32,9 @@ setLog :: FilePath -> UUID -> PreferredContentExpression -> Annex ()
setLog logfile uuid@(UUID _) val = do
c <- liftIO currentVectorClock
Annex.Branch.change logfile $
- buildLog buildPreferredContentExpression
+ buildLogOld buildPreferredContentExpression
. changeLog c uuid val
- . parseLog parsePreferredContentExpression
+ . parseLogOld parsePreferredContentExpression
Annex.changeState $ \s -> s
{ Annex.preferredcontentmap = Nothing
, Annex.requiredcontentmap = Nothing
@@ -70,11 +70,11 @@ buildPreferredContentExpression :: PreferredContentExpression -> Builder
buildPreferredContentExpression = byteString . encodeBS
preferredContentMapRaw :: Annex (M.Map UUID PreferredContentExpression)
-preferredContentMapRaw = simpleMap . parseLog parsePreferredContentExpression
+preferredContentMapRaw = simpleMap . parseLogOld parsePreferredContentExpression
<$> Annex.Branch.get preferredContentLog
requiredContentMapRaw :: Annex (M.Map UUID PreferredContentExpression)
-requiredContentMapRaw = simpleMap . parseLog parsePreferredContentExpression
+requiredContentMapRaw = simpleMap . parseLogOld parsePreferredContentExpression
<$> Annex.Branch.get requiredContentLog
groupPreferredContentMapRaw :: Annex (M.Map Group PreferredContentExpression)
diff --git a/Logs/Remote.hs b/Logs/Remote.hs
index 6f59120deb..ba3c9ff786 100644
--- a/Logs/Remote.hs
+++ b/Logs/Remote.hs
@@ -33,13 +33,13 @@ configSet :: UUID -> RemoteConfig -> Annex ()
configSet u cfg = do
c <- liftIO currentVectorClock
Annex.Branch.change remoteLog $
- buildLog (byteString . encodeBS . showConfig)
+ buildLogOld (byteString . encodeBS . showConfig)
. changeLog c u cfg
- . parseLog remoteConfigParser
+ . parseLogOld remoteConfigParser
{- Map of remotes by uuid containing key/value config maps. -}
readRemoteLog :: Annex (M.Map UUID RemoteConfig)
-readRemoteLog = simpleMap . parseLog remoteConfigParser
+readRemoteLog = simpleMap . parseLogOld remoteConfigParser
<$> Annex.Branch.get remoteLog
remoteConfigParser :: A.Parser RemoteConfig
diff --git a/Logs/Schedule.hs b/Logs/Schedule.hs
index be235a361f..95b9affdff 100644
--- a/Logs/Schedule.hs
+++ b/Logs/Schedule.hs
@@ -34,15 +34,15 @@ scheduleSet :: UUID -> [ScheduledActivity] -> Annex ()
scheduleSet uuid@(UUID _) activities = do
c <- liftIO currentVectorClock
Annex.Branch.change scheduleLog $
- buildLog byteString
+ buildLogOld byteString
. changeLog c uuid (encodeBS val)
- . parseLog A.takeByteString
+ . parseLogOld A.takeByteString
where
val = fromScheduledActivities activities
scheduleSet NoUUID _ = error "unknown UUID; cannot modify"
scheduleMap :: Annex (M.Map UUID [ScheduledActivity])
-scheduleMap = simpleMap . parseLog parser <$> Annex.Branch.get scheduleLog
+scheduleMap = simpleMap . parseLogOld parser <$> Annex.Branch.get scheduleLog
where
parser = either fail pure . parseScheduledActivities . decodeBS
=<< A.takeByteString
diff --git a/Logs/Trust/Basic.hs b/Logs/Trust/Basic.hs
index 8917c6838f..d1328081ae 100644
--- a/Logs/Trust/Basic.hs
+++ b/Logs/Trust/Basic.hs
@@ -24,9 +24,9 @@ trustSet :: UUID -> TrustLevel -> Annex ()
trustSet uuid@(UUID _) level = do
c <- liftIO currentVectorClock
Annex.Branch.change trustLog $
- buildLog buildTrustLevel .
+ buildLogOld buildTrustLevel .
changeLog c uuid level .
- parseLog trustLevelParser
+ parseLogOld trustLevelParser
Annex.changeState $ \s -> s { Annex.trustmap = Nothing }
trustSet NoUUID _ = error "unknown UUID; cannot modify"
diff --git a/Logs/Trust/Pure.hs b/Logs/Trust/Pure.hs
index 96f7a33aa6..1a5ca65adf 100644
--- a/Logs/Trust/Pure.hs
+++ b/Logs/Trust/Pure.hs
@@ -19,7 +19,7 @@ import qualified Data.Attoparsec.ByteString.Char8 as A8
import Data.ByteString.Builder
calcTrustMap :: L.ByteString -> TrustMap
-calcTrustMap = simpleMap . parseLog trustLevelParser
+calcTrustMap = simpleMap . parseLogOld trustLevelParser
trustLevelParser :: A.Parser TrustLevel
trustLevelParser = (totrust <$> A8.anyChar <* A.endOfInput)
diff --git a/Logs/UUID.hs b/Logs/UUID.hs
index f2d5c0f077..21888df472 100644
--- a/Logs/UUID.hs
+++ b/Logs/UUID.hs
@@ -32,7 +32,7 @@ describeUUID :: UUID -> UUIDDesc -> Annex ()
describeUUID uuid desc = do
c <- liftIO currentVectorClock
Annex.Branch.change uuidLog $
- buildLog buildUUIDDesc . changeLog c uuid desc . parseUUIDLog
+ buildLogOld buildUUIDDesc . changeLog c uuid desc . parseUUIDLog
{- The map is cached for speed. -}
uuidDescMap :: Annex UUIDDescMap
@@ -53,4 +53,4 @@ uuidDescMapLoad = do
preferold = flip const
parseUUIDLog :: L.ByteString -> Log UUIDDesc
-parseUUIDLog = parseLog (UUIDDesc <$> A.takeByteString)
+parseUUIDLog = parseLogOld (UUIDDesc <$> A.takeByteString)
diff --git a/Logs/UUIDBased.hs b/Logs/UUIDBased.hs
index 921aa504b7..384ba4e054 100644
--- a/Logs/UUIDBased.hs
+++ b/Logs/UUIDBased.hs
@@ -3,9 +3,9 @@
- This is used to store information about UUIDs in a way that can
- be union merged.
-
- - A line of the log will look like: "UUID[ INFO[ timestamp=foo]]"
+ - The old format looks like: "UUID[ INFO[ timestamp=foo]]"
- The timestamp is last for backwards compatability reasons,
- - and may not be present on old log lines.
+ - and may not be present on very old log lines.
-
- New uuid based logs instead use the form: "timestamp UUID INFO"
-
@@ -21,10 +21,10 @@ module Logs.UUIDBased (
LogEntry(..),
VectorClock,
currentVectorClock,
- parseLog,
+ parseLogOld,
parseLogNew,
- parseLogWithUUID,
- buildLog,
+ parseLogOldWithUUID,
+ buildLogOld,
buildLogNew,
changeLog,
addLog,
@@ -48,8 +48,8 @@ import qualified Data.DList as D
type Log v = MapLog UUID v
-buildLog :: (v -> Builder) -> Log v -> Builder
-buildLog builder = mconcat . map genline . M.toList
+buildLogOld :: (v -> Builder) -> Log v -> Builder
+buildLogOld builder = mconcat . map genline . M.toList
where
genline (u, LogEntry c@(VectorClock {}) v) =
buildUUID u <> sp <> builder v <> sp <>
@@ -59,15 +59,15 @@ buildLog builder = mconcat . map genline . M.toList
sp = charUtf8 ' '
nl = charUtf8 '\n'
-parseLog :: A.Parser a -> L.ByteString -> Log a
-parseLog = parseLogWithUUID . const
+parseLogOld :: A.Parser a -> L.ByteString -> Log a
+parseLogOld = parseLogOldWithUUID . const
-parseLogWithUUID :: (UUID -> A.Parser a) -> L.ByteString -> Log a
-parseLogWithUUID parser = fromMaybe M.empty . A.maybeResult
- . A.parse (logParser parser)
+parseLogOldWithUUID :: (UUID -> A.Parser a) -> L.ByteString -> Log a
+parseLogOldWithUUID parser = fromMaybe M.empty . A.maybeResult
+ . A.parse (logParserOld parser)
-logParser :: (UUID -> A.Parser a) -> A.Parser (Log a)
-logParser parser = M.fromListWith best <$> parseLogLines go
+logParserOld :: (UUID -> A.Parser a) -> A.Parser (Log a)
+logParserOld parser = M.fromListWith best <$> parseLogLines go
where
go = do
u <- toUUID <$> A8.takeWhile1 (/= ' ')
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 09:09:52 +0000