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

5
Logs/Group.hs
View file

@ -40,7 +40,7 @@ groupChange uuid@(UUID _) modifier = do
curr <- lookupGroups uuid
c <- liftIO currentVectorClock
Annex.Branch.change groupLog $
buildLog buildGroup . changeLog c uuid (modifier curr) . parseLog parseGroup
buildLogOld buildGroup . changeLog c uuid (modifier curr) . parseLogOld parseGroup
-- The changed group invalidates the preferred content cache.
Annex.changeState $ \s -> s
@ -76,7 +76,8 @@ groupMap = maybe groupMapLoad return =<< Annex.getState Annex.groupmap
{- Loads the map, updating the cache. -}
groupMapLoad :: Annex GroupMap
groupMapLoad = do
m <- makeGroupMap . simpleMap . parseLog parseGroup <$> Annex.Branch.get groupLog
m <- makeGroupMap . simpleMap . parseLogOld parseGroup
<$> Annex.Branch.get groupLog
Annex.changeState $ \s -> s { Annex.groupmap = Just m }
return m