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
|
2010-11-02 23:04:24 +00:00
|
|
|
import qualified Backend
|
2011-10-15 20:21:08 +00:00
|
|
|
import Logs.Location
|
2011-10-04 04:40:47 +00:00
|
|
|
import Annex.Content
|
2011-08-20 20:11:42 +00:00
|
|
|
import Utility.Touch
|
2011-09-15 20:57:02 +00:00
|
|
|
import Backend
|
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. -}
|
2011-09-15 20:50:49 +00:00
|
|
|
start :: BackendFile -> CommandStart
|
2011-12-07 20:53:53 +00:00
|
|
|
start p@(_, file) = notBareRepo $ ifAnnexed file fixup add
|
|
|
|
where
|
|
|
|
add = do
|
|
|
|
s <- liftIO $ getSymbolicLinkStatus file
|
|
|
|
if isSymbolicLink s || not (isRegularFile s)
|
|
|
|
then stop
|
|
|
|
else do
|
|
|
|
showStart "add" file
|
|
|
|
next $ perform p
|
|
|
|
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
|
|
|
|
2010-12-30 18:19:16 +00:00
|
|
|
perform :: BackendFile -> CommandPerform
|
2011-10-31 20:46:51 +00:00
|
|
|
perform (backend, file) = Backend.genKey file backend >>= go
|
|
|
|
where
|
|
|
|
go Nothing = stop
|
|
|
|
go (Just (key, _)) = do
|
2011-07-08 01:29:31 +00:00
|
|
|
handle (undo file key) $ moveAnnex key file
|
2011-08-06 18:57:22 +00:00
|
|
|
next $ cleanup file key True
|
2010-11-02 23:04:24 +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
|
2011-07-15 16:47:14 +00:00
|
|
|
unlessM (inAnnex key) rethrow -- no cleanup to do
|
|
|
|
liftIO $ whenM (doesFileExist file) $ removeFile file
|
2011-07-08 01:29:31 +00:00
|
|
|
handle tryharder $ fromAnnex key file
|
|
|
|
logStatus key InfoMissing
|
|
|
|
rethrow
|
|
|
|
where
|
2011-10-04 04:34:04 +00:00
|
|
|
rethrow = throw e
|
2011-03-15 03:00:23 +00:00
|
|
|
|
2011-07-08 01:29:31 +00:00
|
|
|
-- 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
|
|
|
|
2011-08-06 18:57:22 +00:00
|
|
|
cleanup :: FilePath -> Key -> Bool -> CommandCleanup
|
|
|
|
cleanup file key hascontent = do
|
2011-07-08 01:29:31 +00:00
|
|
|
handle (undo file key) $ do
|
|
|
|
link <- calcGitLink file key
|
|
|
|
liftIO $ createSymbolicLink link file
|
2011-08-06 18:57:22 +00:00
|
|
|
|
|
|
|
when hascontent $ do
|
|
|
|
logStatus key InfoPresent
|
2011-07-08 01:29:31 +00:00
|
|
|
|
2011-08-06 18:57:22 +00:00
|
|
|
-- touch the symlink to have the same mtime as the
|
|
|
|
-- file it points to
|
support all filename encodings with ghc 7.4
Under ghc 7.4, this seems to be able to handle all filename encodings
again. Including filename encodings that do not match the LANG setting.
I think this will not work with earlier versions of ghc, it uses some ghc
internals.
Turns out that ghc 7.4 has a special filesystem encoding that it uses when
reading/writing filenames (as FilePaths). This encoding is documented
to allow "arbitrary undecodable bytes to be round-tripped through it".
So, to get FilePaths from eg, git ls-files, set the Handle that is reading
from git to use this encoding. Then things basically just work.
However, I have not found a way to make Text read using this encoding.
Text really does assume unicode. So I had to switch back to using String
when reading/writing data to git. Which is a pity, because it's some
percent slower, but at least it works.
Note that stdout and stderr also have to be set to this encoding, or
printing out filenames that contain undecodable bytes causes a crash.
IMHO this is a misfeature in ghc, that the user can pass you a filename,
which you can readFile, etc, but that default, putStr of filename may
cause a crash!
Git.CheckAttr gave me special trouble, because the filenames I got back
from git, after feeding them in, had further encoding breakage.
Rather than try to deal with that, I just zip up the input filenames
with the attributes. Which must be returned in the same order queried
for this to work.
Also of note is an apparent GHC bug I worked around in Git.CheckAttr. It
used to forkProcess and feed git from the child process. Unfortunatly,
after this forkProcess, accessing the `files` variable from the parent
returns []. Not the value that was passed into the function. This screams
of a bad bug, that's clobbering a variable, but for now I just avoid
forkProcess there to work around it. That forkProcess was itself only added
because of a ghc bug, #624389. I've confirmed that the test case for that
bug doesn't reproduce it with ghc 7.4. So that's ok, except for the new ghc
bug I have not isolated and reported. Why does this simple bit of code
magnet the ghc bugs? :)
Also, the symlink touching code is currently broken, when used on utf-8
filenames in a non-utf-8 locale, or probably on any filename containing
undecodable bytes, and I temporarily commented it out.
2012-02-03 19:12:41 +00:00
|
|
|
-- XXX Currently broken on non-utf8 locales when
|
|
|
|
-- dealing with utf-8 filenames.
|
|
|
|
--liftIO $ do
|
|
|
|
--mtime <- modificationTime <$> getFileStatus file
|
|
|
|
--touch file (TimeSpec mtime) False
|
2011-03-15 03:00:23 +00:00
|
|
|
|
2011-06-29 15:42:00 +00:00
|
|
|
force <- Annex.getState Annex.force
|
|
|
|
if force
|
2011-10-04 04:40:47 +00:00
|
|
|
then Annex.Queue.add "add" [Param "-f", Param "--"] [file]
|
|
|
|
else Annex.Queue.add "add" [Param "--"] [file]
|
2010-11-02 23:04:24 +00:00
|
|
|
return True
|