diff options
| author |  Joey Hess <joey@kitenet.net> | 2010-11-09 15:05:08 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-11-09 15:05:08 -0400 |
| commit | 75d29250823326c8b4894a855927f65b5fdf4e13 (patch) | |
| tree | a888b86d8e0569b9e1c388700dd6717aaa175834 /Command/Add.hs | |
| parent | 377bf24d9a951186b374cd7a3f920b6bc9deb8f1 (diff) | |
| parent | 8d5374f4a33f398baa166035e5fafb716a78fd1d (diff) | |
Merge branch 'master' into checkout
Conflicts:
debian/changelog
doc/backends.mdwn
Diffstat (limited to 'Command/Add.hs')
| -rw-r--r-- | Command/Add.hs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Command/Add.hs b/Command/Add.hs index 825c1d8c1..6c5d24f84 100644 --- a/Command/Add.hs +++ b/Command/Add.hs @@ -9,16 +9,14 @@ module Command.Add where import Control.Monad.State (liftIO) import System.Posix.Files -import System.Directory import Command import qualified Annex -import Utility -import Locations import qualified Backend import LocationLog import Types import Core +import Messages {- The add subcommand annexes a file, storing it in a backend, and then - moving it into the annex directory and setting up the symlink pointing @@ -41,11 +39,9 @@ perform (file, backend) = do cleanup :: FilePath -> Key -> SubCmdCleanup cleanup file key = do + moveAnnex key file logStatus key ValuePresent - g <- Annex.gitRepo - let dest = annexLocation g key - liftIO $ createDirectoryIfMissing True (parentDir dest) - liftIO $ renameFile file dest + link <- calcGitLink file key liftIO $ createSymbolicLink link file Annex.queue "add" [] file |