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

finish fast direct mode rename handling. wow, it's fast

Browse source
This commit is contained in:
Joey Hess 2013-03-11 14:14:45 -04:00
parent 87cba71d5a
commit 06046a0d2b
2 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Assistant/Threads/Committer.hs
View file

@ -266,14 +266,13 @@ handleAdds delayadd cs = returnWhen (null incomplete) $ do
Just cache ->
case M.lookup (inodeCacheToKey ct cache) m of
Nothing -> add c
Just k -> fastadd c k cache
Just k -> fastadd c k
fastadd :: Change -> Key -> InodeCache -> Assistant (Maybe Change)
fastadd change key cache = do
-- TODO do fast method
debug ["rename detected", show change, show key, show cache]
add change
--return $ Just $ finishedChange change key
fastadd :: Change -> Key -> Assistant (Maybe Change)
fastadd change key = do
let source = keySource change
liftAnnex $ Command.Add.finishIngestDirect key source
done change (keyFilename source) key
removedKeysMap :: InodeComparisonType -> [Change] -> Annex (M.Map InodeCacheKey Key)
removedKeysMap ct l = do
@ -291,16 +290,15 @@ handleAdds delayadd cs = returnWhen (null incomplete) $ do
liftAnnex showEndFail
return Nothing
done change file key = do
liftAnnex $ do
logStatus key InfoPresent
link <- ifM isDirect
( calcGitLink file key
, Command.Add.link file key True
)
whenM (pure DirWatcher.eventsCoalesce <||> isDirect) $ do
stageSymlink file =<< hashSymlink link
showEndOk
done change file key = liftAnnex $ do
logStatus key InfoPresent
link <- ifM isDirect
( calcGitLink file key
, Command.Add.link file key True
)
whenM (pure DirWatcher.eventsCoalesce <||> isDirect) $ do
stageSymlink file =<< hashSymlink link
showEndOk
return $ Just $ finishedChange change key
{- Check that the keysource's keyFilename still exists,