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

avoid accidental Show of VectorClock

Browse source 
Removed its Show instance.
This commit is contained in:
Joey Hess 2017-08-14 14:43:56 -04:00
parent 2cecc8d2a3
commit 0b307f43e1
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
6 changed files with 29 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Logs/Transitions.hs
View file

@ -16,7 +16,6 @@ module Logs.Transitions where
import Annex.Common
import Annex.VectorClock
import Logs.TimeStamp
import Logs.Line
import qualified Data.Set as S
@ -32,7 +31,7 @@ data Transition
data TransitionLine = TransitionLine
{ transitionStarted :: VectorClock
, transition :: Transition
} deriving (Show, Ord, Eq)
} deriving (Ord, Eq)
type Transitions = S.Set TransitionLine
@ -63,16 +62,16 @@ parseTransitionsStrictly source = fromMaybe badsource . parseTransitions
badsource = giveup $ "unknown transitions listed in " ++ source ++ "; upgrade git-annex!"
showTransitionLine :: TransitionLine -> String
showTransitionLine (TransitionLine ts t) = unwords [show t, show ts]
showTransitionLine (TransitionLine c t) = unwords [show t, formatVectorClock c]
parseTransitionLine :: String -> Maybe TransitionLine
parseTransitionLine s = TransitionLine
<$> (VectorClock <$> parsePOSIXTime ds)
<$> parseVectorClock cs
<*> readish ts
where
ws = words s
ts = Prelude.head ws
ds = unwords $ Prelude.tail ws
cs = unwords $ Prelude.tail ws
combineTransitions :: [Transitions] -> Transitions
combineTransitions = S.unions