convert transitions.log to attoparsec and bytestring-builder

Not likely to be any speed gain here, but this completes porting every
log file over.

And, it let me get rid of code copied from ghc and modified, so
simplifying the licensing.
This commit is contained in:
Joey Hess 2019-01-10 17:13:30 -04:00
parent 591e4b145f
commit 2eadb6cd68
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
5 changed files with 49 additions and 112 deletions

View file

@ -183,7 +183,7 @@ updateTo' pairs = do
else return $ "merging " ++
unwords (map Git.Ref.describe branches) ++
" into " ++ fromRef name
localtransitions <- parseTransitionsStrictly "local" . decodeBL
localtransitions <- parseTransitionsStrictly "local"
<$> getLocal transitionsLog
unless (null tomerge) $ do
showSideAction merge_desc
@ -524,7 +524,7 @@ handleTransitions jl localts refs = do
return True
where
getreftransition ref = do
ts <- parseTransitionsStrictly "remote" . decodeBL
ts <- parseTransitionsStrictly "remote"
<$> catFile ref transitionsLog
return (ref, ts)
@ -560,7 +560,7 @@ performTransitionsLocked jl ts neednewlocalbranch transitionedrefs = do
| neednewlocalbranch && null transitionedrefs = "new branch for transition " ++ tdesc
| otherwise = "continuing transition " ++ tdesc
tdesc = show $ map describeTransition tlist
tlist = transitionList ts
tlist = knownTransitionList ts
{- The changes to make to the branch are calculated and applied to
- the branch directly, rather than going through the journal,