From 9887a378fef66780da4c63a81a811e68969e6a7f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 21 Feb 2019 13:43:21 -0400 Subject: renamings to make clean when old-format logs are being used --- Logs.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Logs.hs') 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 -- cgit v1.2.3