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

make watch use the queue

Browse source 
May not work. Certianly needs to flush the queue from time to time
when only symlink changes are being made.
This commit is contained in:
Joey Hess 2012-06-07 15:40:44 -04:00
parent 0a11b35d89
commit 20f425be19
5 changed files with 35 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Git/UnionMerge.hs
View file

@ -74,8 +74,9 @@ mergeFile :: String -> FilePath -> CatFileHandle -> Repo -> IO (Maybe String)
mergeFile info file h repo = case filter (/= nullSha) [Ref asha, Ref bsha] of
[] -> return Nothing
(sha:[]) -> use sha
shas -> use =<< either return (hashObject repo BlobObject . unlines) =<<
calcMerge . zip shas <$> mapM getcontents shas
shas -> use
=<< either return (\s -> hashObject BlobObject (unlines s) repo)
=<< calcMerge . zip shas <$> mapM getcontents shas
where
[_colonmode, _bmode, asha, bsha, _status] = words info
getcontents s = map L.unpack . L.lines .