refactoring

filterBranch should be reusable for copy-branch command.

Changed LogVariety to differentiate between LocationLog and UrlLog;
only location logs contain uuids and need to be filtered by uuid,
while url logs do not. This does not change current behavior,
but it will let filterBranch be reused without filtering url logs
incorrectly.

diff --git a/Annex/Branch.hs b/Annex/Branch.hs
index 2d906af33e83d9053d1ea6044475cec1d1a58851..7b3fa0def96b00ae6942ec4eeb8bfaa84f06e7b9 100644 (file)
--- a/Annex/Branch.hs
+++ b/Annex/Branch.hs
@@ -678,7 +678,7 @@ performTransitionsLocked jl ts neednewlocalbranch transitionedrefs = do
                trustmap <- calcTrustMap <$> getStaged trustLog
                remoteconfigmap <- calcRemoteConfigMap <$> getStaged remoteLog
                -- partially apply, improves performance
-               let changers' = map (\c -> c config trustmap remoteconfigmap) changers
+               let changers' = map (\c -> c trustmap remoteconfigmap config) changers
                (fs, cleanup) <- branchFiles
                forM_ fs $ \f -> do
                        content <- getStaged f

diff --git a/Annex/Branch/Transitions.hs b/Annex/Branch/Transitions.hs
index d368d80974f3fde5fb64f52117bfa11af8071127..cec95cc4789a8c0d2a5cdb74c539ca36d41ad648 100644 (file)
--- a/Annex/Branch/Transitions.hs
+++ b/Annex/Branch/Transitions.hs
@@ -1,6 +1,6 @@
 {- git-annex branch transitions
  -
- - Copyright 2013-2019 Joey Hess <id@joeyh.name>
+ - Copyright 2013-2021 Joey Hess <id@joeyh.name>
  -
  - Licensed under the GNU AGPL version 3 or higher.
  -}
@@ -36,9 +36,9 @@ data FileTransition
        = ChangeFile Builder
        | PreserveFile
 
-type TransitionCalculator = GitConfig -> TrustMap -> M.Map UUID RemoteConfig -> RawFilePath -> L.ByteString -> FileTransition
+type TransitionCalculator = GitConfig -> RawFilePath -> L.ByteString -> FileTransition
 
-getTransitionCalculator :: Transition -> Maybe TransitionCalculator
+getTransitionCalculator :: Transition -> Maybe (TrustMap -> M.Map UUID RemoteConfig -> TransitionCalculator)
 getTransitionCalculator ForgetGitHistory = Nothing
 getTransitionCalculator ForgetDeadRemotes = Just dropDead
 
@@ -54,36 +54,17 @@ getTransitionCalculator ForgetDeadRemotes = Just dropDead
 -- the latter uuid, that also needs to be removed. The sameas-uuid
 -- is not removed from the remote log, for the same reason the trust log
 -- is not changed.
-dropDead :: TransitionCalculator
-dropDead gc trustmap remoteconfigmap f content = case getLogVariety gc f of
-       Just OldUUIDBasedLog
-               | f == trustLog -> PreserveFile
-               | f == remoteLog -> ChangeFile $
-                       Remote.buildRemoteConfigLog $
-                               M.mapWithKey minimizesameasdead $
-                                       dropDeadFromMapLog trustmap id $
-                                               Remote.parseRemoteConfigLog content
-               | otherwise -> ChangeFile $
-                       UUIDBased.buildLogOld byteString $
-                               dropDeadFromMapLog trustmap' id $
-                                       UUIDBased.parseLogOld A.takeByteString content
-       Just NewUUIDBasedLog -> ChangeFile $
-               UUIDBased.buildLogNew byteString $
-                       dropDeadFromMapLog trustmap' id $
-                               UUIDBased.parseLogNew A.takeByteString content
-       Just (ChunkLog _) -> ChangeFile $
-               Chunk.buildLog $ dropDeadFromMapLog trustmap' fst $
-                       Chunk.parseLog content
-       Just (PresenceLog _) -> ChangeFile $ Presence.buildLog $
-               Presence.compactLog $
-                       dropDeadFromPresenceLog trustmap' $
-                               Presence.parseLog content
-       Just RemoteMetaDataLog -> ChangeFile $ MetaData.buildLog $
-               dropDeadFromRemoteMetaDataLog trustmap' $
-                       MetaData.simplifyLog $ MetaData.parseLog content
-       Just OtherLog -> PreserveFile
-       Nothing -> PreserveFile
+dropDead :: TrustMap -> M.Map UUID RemoteConfig -> TransitionCalculator
+dropDead trustmap remoteconfigmap gc f content
+       | f == trustLog = PreserveFile
+       | f == remoteLog = ChangeFile $
+               Remote.buildRemoteConfigLog $
+                       M.mapWithKey minimizesameasdead $
+                               filterMapLog (notdead trustmap) id $
+                                       Remote.parseRemoteConfigLog content
+       | otherwise = filterBranch (notdead trustmap') gc f content
   where
+       notdead m u = M.findWithDefault def u m /= DeadTrusted
        trustmap' = trustmap `M.union`
                M.map (const DeadTrusted) (M.filter sameasdead remoteconfigmap)
        sameasdead cm =
@@ -96,19 +77,37 @@ dropDead gc trustmap remoteconfigmap f content = case getLogVariety gc f of
                | otherwise = l
        minimizesameasdead' c = M.restrictKeys c (S.singleton sameasUUIDField)
 
-dropDeadFromMapLog :: TrustMap -> (k -> UUID) -> M.Map k v -> M.Map k v
-dropDeadFromMapLog trustmap getuuid =
-       M.filterWithKey $ \k _v -> notDead trustmap getuuid k
+filterBranch :: (UUID -> Bool) -> TransitionCalculator
+filterBranch wantuuid gc f content = case getLogVariety gc f of
+       Just OldUUIDBasedLog -> ChangeFile $
+               UUIDBased.buildLogOld byteString $
+                       filterMapLog wantuuid id $
+                               UUIDBased.parseLogOld A.takeByteString content
+       Just NewUUIDBasedLog -> ChangeFile $
+               UUIDBased.buildLogNew byteString $
+                       filterMapLog wantuuid id $
+                               UUIDBased.parseLogNew A.takeByteString content
+       Just (ChunkLog _) -> ChangeFile $
+               Chunk.buildLog $ filterMapLog wantuuid fst $
+                       Chunk.parseLog content
+       Just (LocationLog _) -> ChangeFile $ Presence.buildLog $
+               Presence.compactLog $
+                       filterLocationLog wantuuid $
+                               Presence.parseLog content
+       Just (UrlLog _) -> PreserveFile
+       Just RemoteMetaDataLog -> ChangeFile $ MetaData.buildLog $
+               filterRemoteMetaDataLog wantuuid $
+                       MetaData.simplifyLog $ MetaData.parseLog content
+       Just OtherLog -> PreserveFile
+       Nothing -> PreserveFile
 
-{- Presence logs can contain UUIDs or other values. Any line that matches
- - a dead uuid is dropped; any other values are passed through. -}
-dropDeadFromPresenceLog :: TrustMap -> [Presence.LogLine] -> [Presence.LogLine]
-dropDeadFromPresenceLog trustmap =
-       filter $ notDead trustmap (toUUID . Presence.fromLogInfo . Presence.info)
+filterMapLog :: (UUID -> Bool) -> (k -> UUID) -> M.Map k v -> M.Map k v
+filterMapLog wantuuid getuuid = M.filterWithKey $ \k _v -> wantuuid (getuuid k)
 
-dropDeadFromRemoteMetaDataLog :: TrustMap -> MetaData.Log MetaData -> MetaData.Log MetaData
-dropDeadFromRemoteMetaDataLog trustmap =
-       MetaData.filterOutEmpty . MetaData.filterRemoteMetaData (notDead trustmap id)
+filterLocationLog :: (UUID -> Bool) -> [Presence.LogLine] -> [Presence.LogLine]
+filterLocationLog wantuuid = filter $
+       wantuuid . toUUID . Presence.fromLogInfo . Presence.info
 
-notDead :: TrustMap -> (v -> UUID) -> v -> Bool
-notDead trustmap a v = M.findWithDefault def (a v) trustmap /= DeadTrusted
+filterRemoteMetaDataLog :: (UUID -> Bool) -> MetaData.Log MetaData -> MetaData.Log MetaData
+filterRemoteMetaDataLog wantuuid = 
+       MetaData.filterOutEmpty . MetaData.filterRemoteMetaData wantuuid

diff --git a/Logs.hs b/Logs.hs
index fcb2106b3384995a00e11d858f385ab7103f3ec8..03d72caa82ade39e72168fe7d594234b0fcc163e 100644 (file)
--- a/Logs.hs
+++ b/Logs.hs
@@ -1,6 +1,6 @@
 {- git-annex log file names
  -
- - Copyright 2013-2020 Joey Hess <id@joeyh.name>
+ - Copyright 2013-2021 Joey Hess <id@joeyh.name>
  -
  - Licensed under the GNU AGPL version 3 or higher.
  -}
@@ -20,7 +20,8 @@ data LogVariety
        = OldUUIDBasedLog
        | NewUUIDBasedLog
        | ChunkLog Key
-       | PresenceLog Key
+       | LocationLog Key
+       | UrlLog Key
        | RemoteMetaDataLog
        | OtherLog
        deriving (Show)
@@ -33,10 +34,11 @@ getLogVariety config f
        | f `elem` topLevelNewUUIDBasedLogs = Just NewUUIDBasedLog
        | isRemoteStateLog f = Just NewUUIDBasedLog
        | isRemoteContentIdentifierLog f = Just NewUUIDBasedLog
-       | isChunkLog f = ChunkLog <$> extLogFileKey chunkLogExt f
        | isRemoteMetaDataLog f = Just RemoteMetaDataLog
-       | isMetaDataLog f || f `elem` otherLogs = Just OtherLog
-       | otherwise = PresenceLog <$> firstJust (presenceLogs config f)
+       | isMetaDataLog f || f `elem` otherTopLevelLogs = Just OtherLog
+       | otherwise = (LocationLog <$> locationLogFileKey config f)
+               <|> (ChunkLog <$> extLogFileKey chunkLogExt f)
+               <|> (UrlLog  <$> urlLogFileKey f)
 
 {- Typical number of log files that may be read while processing a single
  - key. This is used to size a cache.
@@ -79,16 +81,9 @@ topLevelNewUUIDBasedLogs =
        [ exportLog
        ]
 
-{- All the ways to get a key from a presence log file -}
-presenceLogs :: GitConfig -> RawFilePath -> [Maybe Key]
-presenceLogs config f =
-       [ urlLogFileKey f
-       , locationLogFileKey config f
-       ]
-
-{- Top-level logs that are neither UUID based nor presence logs. -}
-otherLogs :: [RawFilePath]
-otherLogs =
+{- Other top-level logs. -}
+otherTopLevelLogs :: [RawFilePath]
+otherTopLevelLogs =
        [ numcopiesLog
        , mincopiesLog
        , configLog
@@ -192,9 +187,6 @@ chunkLogFile config key =
 chunkLogExt :: S.ByteString
 chunkLogExt = ".log.cnk"
 
-isChunkLog :: RawFilePath -> Bool
-isChunkLog path = chunkLogExt `S.isSuffixOf` path
-
 {- The filename of the metadata log for a given key. -}
 metaDataLogFile :: GitConfig -> Key -> RawFilePath
 metaDataLogFile config key =