mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

renamings to make clean when old-format logs are being used

Browse source
This commit is contained in:
Joey Hess 2019-02-21 13:43:21 -04:00
parent fd304dce60
commit 9887a378fe
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
17 changed files with 56 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Logs/ContentIdentifier/Pure.hs
View file

@ -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 []