2010-11-02 23:04:24 +00:00
|
|
|
{- git-annex command
|
|
|
|
-
|
|
|
|
- Copyright 2010 Joey Hess <joey@kitenet.net>
|
|
|
|
-
|
|
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
|
|
-}
|
|
|
|
|
|
|
|
module Command.Add where
|
|
|
|
|
2011-10-05 20:02:51 +00:00
|
|
|
import Common.Annex
|
2011-10-04 04:34:04 +00:00
|
|
|
import Annex.Exception
|
2010-11-02 23:04:24 +00:00
|
|
|
import Command
|
2011-06-29 15:42:00 +00:00
|
|
|
import qualified Annex
|
2011-10-04 04:40:47 +00:00
|
|
|
import qualified Annex.Queue
|
2012-06-05 23:51:03 +00:00
|
|
|
import Backend
|
2011-10-15 20:21:08 +00:00
|
|
|
import Logs.Location
|
2011-10-04 04:40:47 +00:00
|
|
|
import Annex.Content
|
2012-06-06 00:28:34 +00:00
|
|
|
import Annex.Perms
|
2011-08-20 20:11:42 +00:00
|
|
|
import Utility.Touch
|
2012-06-06 00:28:34 +00:00
|
|
|
import Utility.FileMode
|
2010-11-02 23:04:24 +00:00
|
|
|
|
2011-10-29 19:19:05 +00:00
|
|
|
def :: [Command]
|
|
|
|
def = [command "add" paramPaths seek "add files to annex"]
|
2010-12-30 18:19:16 +00:00
|
|
|
|
2010-11-11 22:54:52 +00:00
|
|
|
{- Add acts on both files not checked into git yet, and unlocked files. -}
|
2010-12-30 18:19:16 +00:00
|
|
|
seek :: [CommandSeek]
|
2010-11-11 22:54:52 +00:00
|
|
|
seek = [withFilesNotInGit start, withFilesUnlocked start]
|
|
|
|
|
2010-11-02 23:04:24 +00:00
|
|
|
{- 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
|
|
|
|
- to its content. -}
|
2012-02-14 03:42:44 +00:00
|
|
|
start :: FilePath -> CommandStart
|
|
|
|
start file = notBareRepo $ ifAnnexed file fixup add
|
2011-12-07 20:53:53 +00:00
|
|
|
where
|
|
|
|
add = do
|
|
|
|
s <- liftIO $ getSymbolicLinkStatus file
|
|
|
|
if isSymbolicLink s || not (isRegularFile s)
|
|
|
|
then stop
|
|
|
|
else do
|
|
|
|
showStart "add" file
|
2012-02-14 03:42:44 +00:00
|
|
|
next $ perform file
|
2011-12-07 20:53:53 +00:00
|
|
|
fixup (key, _) = do
|
|
|
|
-- fixup from an interrupted add; the symlink
|
|
|
|
-- is present but not yet added to git
|
2010-11-02 23:04:24 +00:00
|
|
|
showStart "add" file
|
2011-12-07 20:53:53 +00:00
|
|
|
liftIO $ removeFile file
|
|
|
|
next $ next $ cleanup file key =<< inAnnex key
|
2010-11-02 23:04:24 +00:00
|
|
|
|
2012-06-06 00:28:34 +00:00
|
|
|
{- The file that's being added is locked down before a key is generated,
|
|
|
|
- to prevent it from being modified in between. It's hard linked into a
|
|
|
|
- temporary location, and its writable bits are removed. It could still be
|
|
|
|
- written to by a process that already has it open for writing. -}
|
2012-06-06 17:07:30 +00:00
|
|
|
lockDown :: FilePath -> Annex FilePath
|
|
|
|
lockDown file = do
|
2012-06-06 00:28:34 +00:00
|
|
|
liftIO $ preventWrite file
|
|
|
|
tmp <- fromRepo gitAnnexTmpDir
|
|
|
|
createAnnexDirectory tmp
|
|
|
|
pid <- liftIO getProcessID
|
|
|
|
let tmpfile = tmp </> "add" ++ show pid ++ "." ++ takeFileName file
|
2012-06-06 17:13:13 +00:00
|
|
|
liftIO $ nukeFile tmpfile
|
2012-06-06 00:28:34 +00:00
|
|
|
liftIO $ createLink file tmpfile
|
2012-06-06 17:07:30 +00:00
|
|
|
return tmpfile
|
|
|
|
|
|
|
|
{- Moves the file into the annex. -}
|
|
|
|
ingest :: FilePath -> Annex (Maybe Key)
|
|
|
|
ingest file = do
|
|
|
|
tmpfile <- lockDown file
|
2012-06-06 00:28:34 +00:00
|
|
|
let source = KeySource { keyFilename = file, contentLocation = tmpfile }
|
2012-06-05 23:51:03 +00:00
|
|
|
backend <- chooseBackend file
|
2012-06-06 00:28:34 +00:00
|
|
|
genKey source backend >>= go tmpfile
|
2011-10-31 20:46:51 +00:00
|
|
|
where
|
2012-06-06 17:07:30 +00:00
|
|
|
go _ Nothing = return Nothing
|
2012-06-06 00:28:34 +00:00
|
|
|
go tmpfile (Just (key, _)) = do
|
|
|
|
handle (undo file key) $ moveAnnex key tmpfile
|
2012-06-06 17:13:13 +00:00
|
|
|
liftIO $ nukeFile file
|
2012-06-06 17:07:30 +00:00
|
|
|
return $ Just key
|
2010-11-02 23:04:24 +00:00
|
|
|
|
2012-06-06 17:07:30 +00:00
|
|
|
perform :: FilePath -> CommandPerform
|
|
|
|
perform file = maybe stop (\key -> next $ cleanup file key True) =<< ingest file
|
2012-06-06 00:28:34 +00:00
|
|
|
|
2011-07-08 01:29:31 +00:00
|
|
|
{- On error, put the file back so it doesn't seem to have vanished.
|
|
|
|
- This can be called before or after the symlink is in place. -}
|
|
|
|
undo :: FilePath -> Key -> IOException -> Annex a
|
|
|
|
undo file key e = do
|
2012-03-06 18:12:15 +00:00
|
|
|
whenM (inAnnex key) $ do
|
2012-06-06 17:13:13 +00:00
|
|
|
liftIO $ nukeFile file
|
2012-03-06 18:12:15 +00:00
|
|
|
handle tryharder $ fromAnnex key file
|
|
|
|
logStatus key InfoMissing
|
|
|
|
throw e
|
2011-07-08 01:29:31 +00:00
|
|
|
where
|
|
|
|
-- fromAnnex could fail if the file ownership is weird
|
|
|
|
tryharder :: IOException -> Annex ()
|
|
|
|
tryharder _ = do
|
2011-11-29 02:43:51 +00:00
|
|
|
src <- inRepo $ gitAnnexLocation key
|
support .git/annex on a different disk than the rest of the repo
The only fully supported thing is to have the main repository on one disk,
and .git/annex on another. Only commands that move data in/out of the annex
will need to copy it across devices.
There is only partial support for putting arbitrary subdirectories of
.git/annex on different devices. For one thing, but this can require more
copies to be done. For example, when .git/annex/tmp is on one device, and
.git/annex/journal on another, every journal write involves a call to
mv(1). Also, there are a few places that make hard links between various
subdirectories of .git/annex with createLink, that are not handled.
In the common case without cross-device, the new moveFile is actually
faster than renameFile, avoiding an unncessary stat to check that a file
(not a directory) is being moved. Of course if a cross-device move is
needed, it is as slow as mv(1) of the data.
2011-11-28 19:26:27 +00:00
|
|
|
liftIO $ moveFile src file
|
2011-07-07 23:29:36 +00:00
|
|
|
|
2012-06-10 22:29:05 +00:00
|
|
|
{- Creates the symlink to the annexed content. -}
|
|
|
|
link :: FilePath -> Key -> Bool -> Annex ()
|
2012-06-06 17:07:30 +00:00
|
|
|
link file key hascontent = handle (undo file key) $ do
|
|
|
|
l <- calcGitLink file key
|
|
|
|
liftIO $ createSymbolicLink l file
|
2011-08-06 18:57:22 +00:00
|
|
|
|
2012-06-06 17:07:30 +00:00
|
|
|
when hascontent $ do
|
|
|
|
logStatus key InfoPresent
|
2011-07-08 01:29:31 +00:00
|
|
|
|
2012-06-06 17:07:30 +00:00
|
|
|
-- touch the symlink to have the same mtime as the
|
|
|
|
-- file it points to
|
|
|
|
liftIO $ do
|
|
|
|
mtime <- modificationTime <$> getFileStatus file
|
|
|
|
touch file (TimeSpec mtime) False
|
2011-03-15 03:00:23 +00:00
|
|
|
|
2012-06-06 17:07:30 +00:00
|
|
|
{- Note: Several other commands call this, and expect it to
|
|
|
|
- create the symlink and add it. -}
|
|
|
|
cleanup :: FilePath -> Key -> Bool -> CommandCleanup
|
|
|
|
cleanup file key hascontent = do
|
2012-06-06 18:29:10 +00:00
|
|
|
_ <- link file key hascontent
|
2012-03-14 21:43:34 +00:00
|
|
|
params <- ifM (Annex.getState Annex.force)
|
|
|
|
( return [Param "-f"]
|
|
|
|
, return []
|
|
|
|
)
|
2012-06-07 19:19:44 +00:00
|
|
|
Annex.Queue.addCommand "add" (params++[Param "--"]) [file]
|
2010-11-02 23:04:24 +00:00
|
|
|
return True
|