diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-12-24 13:37:29 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-12-24 13:37:29 -0400 |
| commit | 8f4a33ece3651a1bdd1c4073bc0e1dcb86fa6315 (patch) | |
| tree | 93204c8d90a52b5ab50b89302e5450609f8addbf /Assistant/Threads | |
| parent | 100ea25052f40c582d6fe6abe7be5ea4af92f383 (diff) | |
assistant adding of files in direct mode
Diffstat (limited to 'Assistant/Threads')
| -rw-r--r-- | Assistant/Threads/Committer.hs | 20 | ||||
| -rw-r--r-- | Assistant/Threads/Watcher.hs | 3 |
2 files changed, 14 insertions, 9 deletions
diff --git a/Assistant/Threads/Committer.hs b/Assistant/Threads/Committer.hs index ca2148236..213ef11ed 100644 --- a/Assistant/Threads/Committer.hs +++ b/Assistant/Threads/Committer.hs @@ -31,6 +31,7 @@ import qualified Utility.DirWatcher as DirWatcher import Types.KeySource import Config import Annex.Exception +import Annex.Content import Data.Time.Clock import Data.Tuple.Utils @@ -154,7 +155,8 @@ handleAdds delayadd cs = returnWhen (null incomplete) $ do returnWhen (null toadd) $ do added <- catMaybes <$> forM toadd add - if DirWatcher.eventsCoalesce || null added + direct <- liftAnnex isDirect + if DirWatcher.eventsCoalesce || null added || direct then return $ added ++ otherchanges else do r <- handleAdds delayadd =<< getChanges @@ -195,13 +197,15 @@ handleAdds delayadd cs = returnWhen (null incomplete) $ do liftAnnex showEndFail return Nothing done change file (Just key) = do - link <- liftAnnex $ Command.Add.link file key True - when DirWatcher.eventsCoalesce $ - liftAnnex $ do - sha <- inRepo $ - Git.HashObject.hashObject BlobObject link - stageSymlink file sha - showEndOk + link <- liftAnnex $ ifM isDirect + ( calcGitLink file key + , Command.Add.link file key True + ) + liftAnnex $ whenM (pure DirWatcher.eventsCoalesce <||> isDirect) $ do + sha <- inRepo $ + Git.HashObject.hashObject BlobObject link + stageSymlink file sha + showEndOk queueTransfers Next key (Just file) Upload return $ Just change diff --git a/Assistant/Threads/Watcher.hs b/Assistant/Threads/Watcher.hs index 08689cca4..f8957d25e 100644 --- a/Assistant/Threads/Watcher.hs +++ b/Assistant/Threads/Watcher.hs @@ -223,7 +223,8 @@ onErr msg _ = do {- Adds a symlink to the index, without ever accessing the actual symlink - on disk. This avoids a race if git add is used, where the symlink is - - changed to something else immediately after creation. + - changed to something else immediately after creation. It also allows + - direct mode to work. -} stageSymlink :: FilePath -> Sha -> Annex () stageSymlink file sha = |