2015-01-27 21:38:06 +00:00
|
|
|
{- git-annex difference log
|
|
|
|
|
-
|
|
|
|
|
- Copyright 2015 Joey Hess <id@joeyh.name>
|
|
|
|
|
-
|
|
|
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
|
|
|
-}
|
|
|
|
|
|
|
|
|
|
module Logs.Difference (
|
|
|
|
|
recordDifferences,
|
|
|
|
|
recordedDifferences,
|
|
|
|
|
recordedDifferencesFor,
|
|
|
|
|
module Logs.Difference.Pure
|
|
|
|
|
) where
|
|
|
|
|
|
|
|
|
|
import qualified Data.Map as M
|
convert old uuid-based log parsers to attoparsec
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.
2019-01-10 18:39:36 +00:00
|
|
|
import qualified Data.Attoparsec.ByteString as A
|
2019-01-09 18:00:35 +00:00
|
|
|
import Data.ByteString.Builder
|
2015-01-27 21:38:06 +00:00
|
|
|
|
2016-01-20 20:36:33 +00:00
|
|
|
import Annex.Common
|
2015-01-27 21:38:06 +00:00
|
|
|
import Types.Difference
|
|
|
|
|
import qualified Annex.Branch
|
|
|
|
|
import Logs
|
|
|
|
|
import Logs.UUIDBased
|
|
|
|
|
import Logs.Difference.Pure
|
|
|
|
|
|
|
|
|
|
recordDifferences :: Differences -> UUID -> Annex ()
|
2015-06-11 20:25:37 +00:00
|
|
|
recordDifferences ds@(Differences {}) uuid = do
|
2017-08-14 17:55:38 +00:00
|
|
|
c <- liftIO currentVectorClock
|
2015-01-27 21:38:06 +00:00
|
|
|
Annex.Branch.change differenceLog $
|
2019-02-21 17:43:21 +00:00
|
|
|
buildLogOld byteString
|
convert old uuid-based log parsers to attoparsec
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.
2019-01-10 18:39:36 +00:00
|
|
|
. changeLog c uuid (encodeBS $ showDifferences ds)
|
2019-02-21 17:43:21 +00:00
|
|
|
. parseLogOld A.takeByteString
|
2015-01-28 17:47:41 +00:00
|
|
|
recordDifferences UnknownDifferences _ = return ()
|
2015-01-27 21:38:06 +00:00
|
|
|
|
|
|
|
|
-- Map of UUIDs that have Differences recorded.
|
|
|
|
|
-- If a new version of git-annex has added a Difference this version
|
|
|
|
|
-- doesn't know about, it will contain UnknownDifferences.
|
|
|
|
|
recordedDifferences :: Annex (M.Map UUID Differences)
|
convert old uuid-based log parsers to attoparsec
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.
2019-01-10 18:39:36 +00:00
|
|
|
recordedDifferences = parseDifferencesLog <$> Annex.Branch.get differenceLog
|
2015-01-27 21:38:06 +00:00
|
|
|
|
|
|
|
|
recordedDifferencesFor :: UUID -> Annex Differences
|
convert old uuid-based log parsers to attoparsec
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.
2019-01-10 18:39:36 +00:00
|
|
|
recordedDifferencesFor u = fromMaybe mempty . M.lookup u <$> recordedDifferences
|