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

update for DiffTree type change (which fixes assistant in subdir confusion bug)

Browse source
This commit is contained in:
Joey Hess 2013-10-17 15:11:21 -04:00
parent c7b8c776a8
commit 19816bca41
4 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Annex/Direct.hs
View file

@ -13,6 +13,7 @@ import qualified Git.LsFiles
import qualified Git.Merge
import qualified Git.DiffTree as DiffTree
import Git.Sha
import Git.FilePath
import Git.Types
import Annex.CatFile
import qualified Annex.Queue
@ -136,22 +137,22 @@ mergeDirect d branch g = do
mergeDirectCleanup :: FilePath -> Git.Ref -> Git.Ref -> Annex ()
mergeDirectCleanup d oldsha newsha = do
(items, cleanup) <- inRepo $ DiffTree.diffTreeRecursive oldsha newsha
forM_ items updated
makeabs <- flip fromTopFilePath <$> gitRepo
forM_ items (updated makeabs)
void $ liftIO cleanup
liftIO $ removeDirectoryRecursive d
where
updated item = do
updated makeabs item = do
let f = makeabs (DiffTree.file item)
void $ tryAnnex $
go DiffTree.srcsha DiffTree.srcmode moveout moveout_raw
go f DiffTree.srcsha DiffTree.srcmode moveout moveout_raw
void $ tryAnnex $
go DiffTree.dstsha DiffTree.dstmode movein movein_raw
go f DiffTree.dstsha DiffTree.dstmode movein movein_raw
where
go getsha getmode a araw
go f getsha getmode a araw
| getsha item == nullSha = noop
| otherwise =
maybe (araw f) (\k -> void $ a k f)
| otherwise = maybe (araw f) (\k -> void $ a k f)
=<< catKey (getsha item) (getmode item)
f = DiffTree.file item
moveout = removeDirect