591e4b145f
This preserves the workaround for the old bug that caused NoUUID items to be stored in the log, prefixing log lines with " ". It's now handled implicitly, by using takeWhile1 (/= ' ') to get the uuid. There is a behavior change from the old parser, which split the value into words and then recombined it. That meant that "foo bar" and "foo\tbar" came out as "foo bar". That behavior was not documented, and seems surprising; it meant that after a git-annex describe here "foo bar", you wouldn't get that same string back out when git-annex displayed repo descriptions. Otoh, some other parsers relied on the old behavior, and the attoparsec rewrites had to deal with the issue themselves... For group.log, there are some edge cases around the user providing a group name with a leading or trailing space. The old parser would ignore such excess whitespace. The new parser does too, because the alternative is to refuse to parse something like " group1 group2 " due to excess whitespace, which would be even more confusing behavior. The only git-annex branch log file that is not converted to attoparsec and bytestring-builder now is transitions.log.
38 lines
749 B
Haskell
38 lines
749 B
Haskell
{- git-annex repo groups
|
|
-
|
|
- Copyright 2012, 2019 Joey Hess <id@joeyh.name>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
module Types.Group (
|
|
Group(..),
|
|
fromGroup,
|
|
toGroup,
|
|
GroupMap(..),
|
|
emptyGroupMap
|
|
) where
|
|
|
|
import Types.UUID
|
|
import Utility.FileSystemEncoding
|
|
|
|
import qualified Data.Map as M
|
|
import qualified Data.Set as S
|
|
import qualified Data.ByteString as S
|
|
|
|
newtype Group = Group S.ByteString
|
|
deriving (Eq, Ord, Show)
|
|
|
|
fromGroup :: Group -> String
|
|
fromGroup (Group g) = decodeBS g
|
|
|
|
toGroup :: String -> Group
|
|
toGroup = Group . encodeBS
|
|
|
|
data GroupMap = GroupMap
|
|
{ groupsByUUID :: M.Map UUID (S.Set Group)
|
|
, uuidsByGroup :: M.Map Group (S.Set UUID)
|
|
}
|
|
|
|
emptyGroupMap :: GroupMap
|
|
emptyGroupMap = GroupMap M.empty M.empty
|