2011-01-16 20:05:05 +00:00
|
|
|
{- git-annex file content managing
|
2010-10-27 20:53:54 +00:00
|
|
|
-
|
|
|
|
- Copyright 2010 Joey Hess <joey@kitenet.net>
|
|
|
|
-
|
|
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
|
|
-}
|
2010-10-14 07:40:26 +00:00
|
|
|
|
2011-10-04 04:40:47 +00:00
|
|
|
module Annex.Content (
|
2011-01-16 20:05:05 +00:00
|
|
|
inAnnex,
|
2011-11-09 22:33:15 +00:00
|
|
|
inAnnexSafe,
|
|
|
|
lockContent,
|
2011-01-16 20:05:05 +00:00
|
|
|
calcGitLink,
|
|
|
|
logStatus,
|
|
|
|
getViaTmp,
|
2011-03-22 21:27:04 +00:00
|
|
|
getViaTmpUnchecked,
|
2011-04-28 00:06:07 +00:00
|
|
|
withTmp,
|
2011-03-22 21:27:04 +00:00
|
|
|
checkDiskSpace,
|
2011-01-16 20:05:05 +00:00
|
|
|
moveAnnex,
|
|
|
|
removeAnnex,
|
|
|
|
fromAnnex,
|
|
|
|
moveBad,
|
2011-06-23 01:19:52 +00:00
|
|
|
getKeysPresent,
|
2012-01-02 18:20:20 +00:00
|
|
|
saveState,
|
|
|
|
downloadUrl,
|
2012-01-19 21:05:39 +00:00
|
|
|
preseedTmp,
|
2012-04-21 18:06:36 +00:00
|
|
|
freezeContent,
|
|
|
|
thawContent,
|
|
|
|
freezeContentDir,
|
2011-01-16 20:05:05 +00:00
|
|
|
) where
|
2010-10-14 07:40:26 +00:00
|
|
|
|
2012-03-11 22:04:58 +00:00
|
|
|
import System.IO.Unsafe (unsafeInterleaveIO)
|
2011-11-10 01:45:03 +00:00
|
|
|
|
2011-10-05 20:02:51 +00:00
|
|
|
import Common.Annex
|
2011-10-15 20:21:08 +00:00
|
|
|
import Logs.Location
|
2011-10-15 21:47:03 +00:00
|
|
|
import Annex.UUID
|
2011-06-30 17:16:57 +00:00
|
|
|
import qualified Git
|
Clean up handling of git directory and git worktree.
Baked into the code was an assumption that a repository's git directory
could be determined by adding ".git" to its work tree (or nothing for bare
repos). That fails when core.worktree, or GIT_DIR and GIT_WORK_TREE are
used to separate the two.
This was attacked at the type level, by storing the gitdir and worktree
separately, so Nothing for the worktree means a bare repo.
A complication arose because we don't learn where a repository is bare
until its configuration is read. So another Location type handles
repositories that have not had their config read yet. I am not entirely
happy with this being a Location type, rather than representing them
entirely separate from the Git type. The new code is not worse than the
old, but better types could enforce more safety.
Added support for core.worktree. Overriding it with -c isn't supported
because it's not really clear what to do if a git repo's config is read, is
not bare, and is then overridden to bare. What is the right git directory
in this case? I will worry about this if/when someone has a use case for
overriding core.worktree with -c. (See Git.Config.updateLocation)
Also removed and renamed some functions like gitDir and workTree that
misused git's terminology.
One minor regression is known: git annex add in a bare repository does not
print a nice error message, but runs git ls-files in a way that fails
earlier with a less nice error message. This is because before --work-tree
was always passed to git commands, even in a bare repo, while now it's not.
2012-05-18 20:38:26 +00:00
|
|
|
import qualified Git.Config
|
2010-10-14 07:40:26 +00:00
|
|
|
import qualified Annex
|
2011-10-04 04:40:47 +00:00
|
|
|
import qualified Annex.Queue
|
|
|
|
import qualified Annex.Branch
|
2012-03-22 21:09:54 +00:00
|
|
|
import Utility.DiskFree
|
2011-09-23 22:13:24 +00:00
|
|
|
import Utility.FileMode
|
2012-01-02 18:20:20 +00:00
|
|
|
import qualified Utility.Url as Url
|
2011-06-02 01:56:04 +00:00
|
|
|
import Types.Key
|
2011-07-06 00:36:43 +00:00
|
|
|
import Utility.DataUnits
|
2012-01-19 21:05:39 +00:00
|
|
|
import Utility.CopyFile
|
2011-03-28 01:43:25 +00:00
|
|
|
import Config
|
2011-11-10 01:45:03 +00:00
|
|
|
import Annex.Exception
|
2012-04-21 18:06:36 +00:00
|
|
|
import Git.SharedRepository
|
2012-04-21 20:59:49 +00:00
|
|
|
import Annex.Perms
|
2010-10-25 23:17:11 +00:00
|
|
|
|
2011-11-09 22:33:15 +00:00
|
|
|
{- Checks if a given key's content is currently present. -}
|
2010-10-14 23:36:11 +00:00
|
|
|
inAnnex :: Key -> Annex Bool
|
2011-12-09 05:57:13 +00:00
|
|
|
inAnnex = inAnnex' doesFileExist
|
2011-11-09 22:33:15 +00:00
|
|
|
inAnnex' :: (FilePath -> IO a) -> Key -> Annex a
|
|
|
|
inAnnex' a key = do
|
2011-11-08 19:34:10 +00:00
|
|
|
whenM (fromRepo Git.repoIsUrl) $
|
|
|
|
error "inAnnex cannot check remote repo"
|
2011-11-29 02:43:51 +00:00
|
|
|
inRepo $ \g -> gitAnnexLocation key g >>= a
|
2011-11-09 22:33:15 +00:00
|
|
|
|
|
|
|
{- A safer check; the key's content must not only be present, but
|
|
|
|
- is not in the process of being removed. -}
|
|
|
|
inAnnexSafe :: Key -> Annex (Maybe Bool)
|
2012-04-21 18:06:36 +00:00
|
|
|
inAnnexSafe = inAnnex' $ \f -> openforlock f >>= check
|
2011-11-09 22:33:15 +00:00
|
|
|
where
|
2012-04-21 18:06:36 +00:00
|
|
|
openforlock f = catchMaybeIO $
|
|
|
|
openFd f ReadOnly Nothing defaultFileFlags
|
2011-11-10 01:45:03 +00:00
|
|
|
check Nothing = return is_missing
|
|
|
|
check (Just h) = do
|
|
|
|
v <- getLock h (ReadLock, AbsoluteSeek, 0, 0)
|
|
|
|
closeFd h
|
|
|
|
return $ case v of
|
|
|
|
Just _ -> is_locked
|
|
|
|
Nothing -> is_unlocked
|
|
|
|
is_locked = Nothing
|
|
|
|
is_unlocked = Just True
|
|
|
|
is_missing = Just False
|
2010-10-16 17:59:48 +00:00
|
|
|
|
2011-11-10 02:15:33 +00:00
|
|
|
{- Content is exclusively locked while running an action that might remove
|
|
|
|
- it. (If the content is not present, no locking is done.) -}
|
2011-11-09 22:33:15 +00:00
|
|
|
lockContent :: Key -> Annex a -> Annex a
|
2011-11-10 01:45:03 +00:00
|
|
|
lockContent key a = do
|
2011-11-29 02:43:51 +00:00
|
|
|
file <- inRepo $ gitAnnexLocation key
|
2012-04-21 18:06:36 +00:00
|
|
|
bracketIO (openforlock file >>= lock) unlock a
|
2011-11-10 01:45:03 +00:00
|
|
|
where
|
2012-04-21 18:06:36 +00:00
|
|
|
{- Since files are stored with the write bit disabled, have
|
|
|
|
- to fiddle with permissions to open for an exclusive lock. -}
|
|
|
|
openforlock f = catchMaybeIO $ ifM (doesFileExist f)
|
|
|
|
( withModifiedFileMode f
|
|
|
|
(\cur -> cur `unionFileModes` ownerWriteMode)
|
|
|
|
open
|
|
|
|
, open
|
|
|
|
)
|
|
|
|
where
|
|
|
|
open = openFd f ReadWrite Nothing defaultFileFlags
|
2011-11-10 01:45:03 +00:00
|
|
|
lock Nothing = return Nothing
|
2012-04-21 18:06:36 +00:00
|
|
|
lock (Just fd) = do
|
|
|
|
v <- tryIO $ setLock fd (WriteLock, AbsoluteSeek, 0, 0)
|
2011-11-10 06:59:13 +00:00
|
|
|
case v of
|
|
|
|
Left _ -> error "content is locked"
|
2012-04-21 18:06:36 +00:00
|
|
|
Right _ -> return $ Just fd
|
2012-04-22 03:32:33 +00:00
|
|
|
unlock Nothing = noop
|
2011-11-10 01:45:03 +00:00
|
|
|
unlock (Just l) = closeFd l
|
|
|
|
|
2010-10-17 01:03:25 +00:00
|
|
|
{- Calculates the relative path to use to link a file to a key. -}
|
|
|
|
calcGitLink :: FilePath -> Key -> Annex FilePath
|
|
|
|
calcGitLink file key = do
|
2011-07-15 07:12:05 +00:00
|
|
|
cwd <- liftIO getCurrentDirectory
|
|
|
|
let absfile = fromMaybe whoops $ absNormPath cwd file
|
2011-11-29 02:43:51 +00:00
|
|
|
loc <- inRepo $ gitAnnexLocation key
|
|
|
|
return $ relPathDirToFile (parentDir absfile) loc
|
2011-05-15 06:49:43 +00:00
|
|
|
where
|
|
|
|
whoops = error $ "unable to normalize " ++ file
|
2010-10-17 16:08:59 +00:00
|
|
|
|
2011-10-15 20:21:08 +00:00
|
|
|
{- Updates the Logs.Location when a key's presence changes in the current
|
2011-07-01 19:24:07 +00:00
|
|
|
- repository. -}
|
2010-10-17 16:08:59 +00:00
|
|
|
logStatus :: Key -> LogStatus -> Annex ()
|
|
|
|
logStatus key status = do
|
2011-10-11 18:43:45 +00:00
|
|
|
u <- getUUID
|
2011-11-09 05:15:51 +00:00
|
|
|
logChange key u status
|
2010-10-17 16:08:59 +00:00
|
|
|
|
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
|
|
|
{- Runs an action, passing it a temporary filename to get,
|
2010-10-23 18:26:38 +00:00
|
|
|
- and if the action succeeds, moves the temp file into
|
|
|
|
- the annex as a key's content. -}
|
2010-10-25 18:10:38 +00:00
|
|
|
getViaTmp :: Key -> (FilePath -> Annex Bool) -> Annex Bool
|
2010-10-23 18:26:38 +00:00
|
|
|
getViaTmp key action = do
|
2011-11-08 19:34:10 +00:00
|
|
|
tmp <- fromRepo $ gitAnnexTmpLocation key
|
2011-03-22 21:27:04 +00:00
|
|
|
|
|
|
|
-- Check that there is enough free disk space.
|
|
|
|
-- When the temp file already exists, count the space
|
|
|
|
-- it is using as free.
|
|
|
|
e <- liftIO $ doesFileExist tmp
|
2012-04-20 18:57:57 +00:00
|
|
|
alreadythere <- if e
|
|
|
|
then fromIntegral . fileSize <$> liftIO (getFileStatus tmp)
|
|
|
|
else return 0
|
|
|
|
ifM (checkDiskSpace Nothing key alreadythere)
|
|
|
|
( do
|
2012-04-21 18:06:36 +00:00
|
|
|
when e $ thawContent tmp
|
2012-04-20 18:57:57 +00:00
|
|
|
getViaTmpUnchecked key action
|
|
|
|
, return False
|
|
|
|
)
|
2011-03-22 21:27:04 +00:00
|
|
|
|
2011-07-15 07:12:05 +00:00
|
|
|
prepTmp :: Key -> Annex FilePath
|
|
|
|
prepTmp key = do
|
2011-11-08 19:34:10 +00:00
|
|
|
tmp <- fromRepo $ gitAnnexTmpLocation key
|
2012-04-21 20:59:49 +00:00
|
|
|
createAnnexDirectory (parentDir tmp)
|
2011-07-15 07:12:05 +00:00
|
|
|
return tmp
|
|
|
|
|
2011-03-22 21:27:04 +00:00
|
|
|
{- Like getViaTmp, but does not check that there is enough disk space
|
|
|
|
- for the incoming key. For use when the key content is already on disk
|
|
|
|
- and not being copied into place. -}
|
|
|
|
getViaTmpUnchecked :: Key -> (FilePath -> Annex Bool) -> Annex Bool
|
|
|
|
getViaTmpUnchecked key action = do
|
2011-07-15 07:12:05 +00:00
|
|
|
tmp <- prepTmp key
|
2012-03-14 21:43:34 +00:00
|
|
|
ifM (action tmp)
|
|
|
|
( do
|
2010-11-08 23:26:37 +00:00
|
|
|
moveAnnex key tmp
|
2011-07-01 19:24:07 +00:00
|
|
|
logStatus key InfoPresent
|
2010-10-25 18:10:38 +00:00
|
|
|
return True
|
2012-03-14 21:43:34 +00:00
|
|
|
, do
|
2010-10-25 19:44:27 +00:00
|
|
|
-- the tmp file is left behind, in case caller wants
|
|
|
|
-- to resume its transfer
|
2010-10-25 18:10:38 +00:00
|
|
|
return False
|
2012-03-14 21:43:34 +00:00
|
|
|
)
|
2010-10-23 18:26:38 +00:00
|
|
|
|
2011-04-28 00:06:07 +00:00
|
|
|
{- Creates a temp file, runs an action on it, and cleans up the temp file. -}
|
|
|
|
withTmp :: Key -> (FilePath -> Annex a) -> Annex a
|
|
|
|
withTmp key action = do
|
2011-07-15 07:12:05 +00:00
|
|
|
tmp <- prepTmp key
|
2011-04-28 00:06:07 +00:00
|
|
|
res <- action tmp
|
2011-05-17 07:10:13 +00:00
|
|
|
liftIO $ whenM (doesFileExist tmp) $ liftIO $ removeFile tmp
|
2011-04-28 00:06:07 +00:00
|
|
|
return res
|
|
|
|
|
2011-03-22 21:27:04 +00:00
|
|
|
{- Checks that there is disk space available to store a given key,
|
2012-04-20 18:57:57 +00:00
|
|
|
- in a destination (or the annex) printing a warning if not. -}
|
|
|
|
checkDiskSpace :: Maybe FilePath -> Key -> Integer -> Annex Bool
|
|
|
|
checkDiskSpace destination key alreadythere = do
|
2012-03-22 21:09:54 +00:00
|
|
|
reserve <- getDiskReserve
|
2012-04-20 18:57:57 +00:00
|
|
|
free <- liftIO . getDiskFree =<< dir
|
|
|
|
force <- Annex.getState Annex.force
|
2012-03-22 21:09:54 +00:00
|
|
|
case (free, keySize key) of
|
2012-04-20 18:57:57 +00:00
|
|
|
(Just have, Just need) -> do
|
2012-04-20 20:16:13 +00:00
|
|
|
let ok = (need + reserve <= have + alreadythere) || force
|
|
|
|
unless ok $ do
|
|
|
|
liftIO $ print (need, reserve, have, alreadythere)
|
2012-04-20 18:57:57 +00:00
|
|
|
needmorespace (need + reserve - have - alreadythere)
|
|
|
|
return ok
|
|
|
|
_ -> return True
|
2011-03-22 21:27:04 +00:00
|
|
|
where
|
2012-04-20 18:57:57 +00:00
|
|
|
dir = maybe (fromRepo gitAnnexDir) return destination
|
|
|
|
needmorespace n =
|
|
|
|
warning $ "not enough free space, need " ++
|
2011-07-15 07:12:05 +00:00
|
|
|
roughSize storageUnits True n ++
|
2012-01-15 17:26:17 +00:00
|
|
|
" more" ++ forcemsg
|
|
|
|
forcemsg = " (use --force to override this check or adjust annex.diskreserve)"
|
2011-03-22 21:27:04 +00:00
|
|
|
|
2011-04-29 00:41:40 +00:00
|
|
|
{- Moves a file into .git/annex/objects/
|
|
|
|
-
|
|
|
|
- What if the key there already has content? This could happen for
|
|
|
|
- various reasons; perhaps the same content is being annexed again.
|
|
|
|
- Perhaps there has been a hash collision generating the keys.
|
|
|
|
-
|
|
|
|
- The current strategy is to assume that in this case it's safe to delete
|
|
|
|
- one of the two copies of the content; and the one already in the annex
|
|
|
|
- is left there, assuming it's the original, canonical copy.
|
|
|
|
-
|
|
|
|
- I considered being more paranoid, and checking that both files had
|
|
|
|
- the same content. Decided against it because A) users explicitly choose
|
|
|
|
- a backend based on its hashing properties and so if they're dealing
|
|
|
|
- with colliding files it's their own fault and B) adding such a check
|
|
|
|
- would not catch all cases of colliding keys. For example, perhaps
|
|
|
|
- a remote has a key; if it's then added again with different content then
|
|
|
|
- the overall system now has two different peices of content for that
|
|
|
|
- key, and one of them will probably get deleted later. So, adding the
|
|
|
|
- check here would only raise expectations that git-annex cannot truely
|
|
|
|
- meet.
|
|
|
|
-}
|
2010-11-08 23:26:37 +00:00
|
|
|
moveAnnex :: Key -> FilePath -> Annex ()
|
|
|
|
moveAnnex key src = do
|
2011-11-29 02:43:51 +00:00
|
|
|
dest <- inRepo $ gitAnnexLocation key
|
2012-04-21 18:06:36 +00:00
|
|
|
ifM (liftIO $ doesFileExist dest)
|
|
|
|
( liftIO $ removeFile src
|
2012-03-14 21:43:34 +00:00
|
|
|
, do
|
2012-04-21 20:59:49 +00:00
|
|
|
createContentDir dest
|
|
|
|
liftIO $ moveFile src dest
|
2012-04-21 18:06:36 +00:00
|
|
|
freezeContent dest
|
|
|
|
freezeContentDir dest
|
2012-03-14 21:43:34 +00:00
|
|
|
)
|
2010-11-08 23:26:37 +00:00
|
|
|
|
2011-07-15 07:12:05 +00:00
|
|
|
withObjectLoc :: Key -> ((FilePath, FilePath) -> Annex a) -> Annex a
|
|
|
|
withObjectLoc key a = do
|
2011-11-29 02:43:51 +00:00
|
|
|
file <- inRepo $ gitAnnexLocation key
|
2010-11-08 23:26:37 +00:00
|
|
|
let dir = parentDir file
|
2011-07-15 07:12:05 +00:00
|
|
|
a (dir, file)
|
|
|
|
|
2012-02-24 20:30:47 +00:00
|
|
|
cleanObjectLoc :: Key -> Annex ()
|
|
|
|
cleanObjectLoc key = do
|
|
|
|
file <- inRepo $ gitAnnexLocation key
|
|
|
|
liftIO $ removeparents file (3 :: Int)
|
|
|
|
where
|
2012-04-22 03:32:33 +00:00
|
|
|
removeparents _ 0 = noop
|
2012-02-24 20:30:47 +00:00
|
|
|
removeparents file n = do
|
|
|
|
let dir = parentDir file
|
2012-04-22 03:32:33 +00:00
|
|
|
maybe noop (const $ removeparents dir (n-1))
|
2012-02-24 20:30:47 +00:00
|
|
|
=<< catchMaybeIO (removeDirectory dir)
|
|
|
|
|
2011-07-15 07:12:05 +00:00
|
|
|
{- Removes a key's file from .git/annex/objects/ -}
|
|
|
|
removeAnnex :: Key -> Annex ()
|
2012-02-24 20:30:47 +00:00
|
|
|
removeAnnex key = withObjectLoc key $ \(dir, file) -> do
|
|
|
|
liftIO $ do
|
|
|
|
allowWrite dir
|
|
|
|
removeFile file
|
|
|
|
cleanObjectLoc key
|
2010-11-08 23:26:37 +00:00
|
|
|
|
|
|
|
{- Moves a key's file out of .git/annex/objects/ -}
|
|
|
|
fromAnnex :: Key -> FilePath -> Annex ()
|
2012-02-24 20:30:47 +00:00
|
|
|
fromAnnex key dest = withObjectLoc key $ \(dir, file) -> do
|
2012-04-21 18:06:36 +00:00
|
|
|
liftIO $ allowWrite dir
|
|
|
|
thawContent file
|
|
|
|
liftIO $ moveFile file dest
|
2012-02-24 20:30:47 +00:00
|
|
|
cleanObjectLoc key
|
2010-11-08 20:47:36 +00:00
|
|
|
|
2010-11-13 18:59:27 +00:00
|
|
|
{- Moves a key out of .git/annex/objects/ into .git/annex/bad, and
|
2010-11-13 19:42:56 +00:00
|
|
|
- returns the file it was moved to. -}
|
2010-11-13 18:59:27 +00:00
|
|
|
moveBad :: Key -> Annex FilePath
|
|
|
|
moveBad key = do
|
2011-11-29 02:43:51 +00:00
|
|
|
src <- inRepo $ gitAnnexLocation key
|
2011-11-11 05:52:58 +00:00
|
|
|
bad <- fromRepo gitAnnexBadDir
|
2011-11-08 19:34:10 +00:00
|
|
|
let dest = bad </> takeFileName src
|
2012-04-21 20:59:49 +00:00
|
|
|
createAnnexDirectory (parentDir dest)
|
2011-07-01 05:11:41 +00:00
|
|
|
liftIO $ do
|
|
|
|
allowWrite (parentDir src)
|
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
|
|
|
moveFile src dest
|
2012-02-24 20:30:47 +00:00
|
|
|
cleanObjectLoc key
|
2011-07-01 19:24:07 +00:00
|
|
|
logStatus key InfoMissing
|
2010-11-13 18:59:27 +00:00
|
|
|
return dest
|
|
|
|
|
2010-11-08 19:15:21 +00:00
|
|
|
{- List of keys whose content exists in .git/annex/objects/ -}
|
|
|
|
getKeysPresent :: Annex [Key]
|
2012-03-11 22:04:58 +00:00
|
|
|
getKeysPresent = liftIO . traverse (2 :: Int) =<< fromRepo gitAnnexObjectDir
|
|
|
|
where
|
|
|
|
traverse depth dir = do
|
|
|
|
contents <- catchDefaultIO (dirContents dir) []
|
|
|
|
if depth == 0
|
|
|
|
then continue (mapMaybe (fileKey . takeFileName) contents) []
|
|
|
|
else do
|
|
|
|
let deeper = traverse (depth - 1)
|
|
|
|
continue [] (map deeper contents)
|
|
|
|
continue keys [] = return keys
|
|
|
|
continue keys (a:as) = do
|
|
|
|
{- Force lazy traversal with unsafeInterleaveIO. -}
|
|
|
|
morekeys <- unsafeInterleaveIO a
|
|
|
|
continue (morekeys++keys) as
|
2011-06-23 01:19:52 +00:00
|
|
|
|
2012-01-28 19:41:52 +00:00
|
|
|
{- Things to do to record changes to content when shutting down.
|
|
|
|
-
|
|
|
|
- It's acceptable to avoid committing changes to the branch,
|
|
|
|
- especially if performing a short-lived action.
|
|
|
|
-}
|
|
|
|
saveState :: Bool -> Annex ()
|
2012-04-27 17:23:52 +00:00
|
|
|
saveState oneshot = doSideAction $ do
|
|
|
|
Annex.Queue.flush
|
2012-03-14 21:43:34 +00:00
|
|
|
unless oneshot $
|
|
|
|
ifM alwayscommit
|
|
|
|
( Annex.Branch.commit "update" , Annex.Branch.stage)
|
|
|
|
where
|
Clean up handling of git directory and git worktree.
Baked into the code was an assumption that a repository's git directory
could be determined by adding ".git" to its work tree (or nothing for bare
repos). That fails when core.worktree, or GIT_DIR and GIT_WORK_TREE are
used to separate the two.
This was attacked at the type level, by storing the gitdir and worktree
separately, so Nothing for the worktree means a bare repo.
A complication arose because we don't learn where a repository is bare
until its configuration is read. So another Location type handles
repositories that have not had their config read yet. I am not entirely
happy with this being a Location type, rather than representing them
entirely separate from the Git type. The new code is not worse than the
old, but better types could enforce more safety.
Added support for core.worktree. Overriding it with -c isn't supported
because it's not really clear what to do if a git repo's config is read, is
not bare, and is then overridden to bare. What is the right git directory
in this case? I will worry about this if/when someone has a use case for
overriding core.worktree with -c. (See Git.Config.updateLocation)
Also removed and renamed some functions like gitDir and workTree that
misused git's terminology.
One minor regression is known: git annex add in a bare repository does not
print a nice error message, but runs git ls-files in a way that fails
earlier with a less nice error message. This is because before --work-tree
was always passed to git commands, even in a bare repo, while now it's not.
2012-05-18 20:38:26 +00:00
|
|
|
alwayscommit = fromMaybe True . Git.Config.isTrue
|
2012-05-06 00:15:32 +00:00
|
|
|
<$> getConfig (annexConfig "alwayscommit") ""
|
2012-01-02 18:20:20 +00:00
|
|
|
|
|
|
|
{- Downloads content from any of a list of urls. -}
|
|
|
|
downloadUrl :: [Url.URLString] -> FilePath -> Annex Bool
|
|
|
|
downloadUrl urls file = do
|
2012-05-06 00:15:32 +00:00
|
|
|
o <- map Param . words <$> getConfig (annexConfig "web-options") ""
|
2012-04-22 05:13:09 +00:00
|
|
|
headers <- getHttpHeaders
|
|
|
|
liftIO $ anyM (\u -> Url.download u headers o file) urls
|
2012-01-19 21:05:39 +00:00
|
|
|
|
|
|
|
{- Copies a key's content, when present, to a temp file.
|
|
|
|
- This is used to speed up some rsyncs. -}
|
2012-01-20 17:23:11 +00:00
|
|
|
preseedTmp :: Key -> FilePath -> Annex Bool
|
|
|
|
preseedTmp key file = go =<< inAnnex key
|
|
|
|
where
|
|
|
|
go False = return False
|
|
|
|
go True = do
|
|
|
|
ok <- copy
|
2012-04-21 18:06:36 +00:00
|
|
|
when ok $ thawContent file
|
2012-01-20 17:23:11 +00:00
|
|
|
return ok
|
2012-03-14 21:43:34 +00:00
|
|
|
copy = ifM (liftIO $ doesFileExist file)
|
|
|
|
( return True
|
|
|
|
, do
|
2012-01-20 17:23:11 +00:00
|
|
|
s <- inRepo $ gitAnnexLocation key
|
|
|
|
liftIO $ copyFileExternal s file
|
2012-03-14 21:43:34 +00:00
|
|
|
)
|
2012-04-21 18:06:36 +00:00
|
|
|
|
|
|
|
{- Blocks writing to an annexed file. The file is made unwritable
|
|
|
|
- to avoid accidental edits. core.sharedRepository may change
|
|
|
|
- who can read it. -}
|
|
|
|
freezeContent :: FilePath -> Annex ()
|
|
|
|
freezeContent file = liftIO . go =<< fromRepo getSharedRepository
|
|
|
|
where
|
2012-04-21 20:01:56 +00:00
|
|
|
go GroupShared = modifyFileMode file $
|
|
|
|
removeModes writeModes .
|
|
|
|
addModes [ownerReadMode, groupReadMode]
|
|
|
|
go AllShared = modifyFileMode file $
|
|
|
|
removeModes writeModes .
|
|
|
|
addModes readModes
|
2012-04-21 18:06:36 +00:00
|
|
|
go _ = preventWrite file
|
|
|
|
|
|
|
|
{- Allows writing to an annexed file that freezeContent was called on
|
|
|
|
- before. -}
|
|
|
|
thawContent :: FilePath -> Annex ()
|
|
|
|
thawContent file = liftIO . go =<< fromRepo getSharedRepository
|
|
|
|
where
|
|
|
|
go GroupShared = groupWriteRead file
|
|
|
|
go AllShared = groupWriteRead file
|
|
|
|
go _ = allowWrite file
|
|
|
|
|
|
|
|
{- Blocks writing to the directory an annexed file is in, to prevent the
|
|
|
|
- file accidentially being deleted. However, if core.sharedRepository
|
|
|
|
- is set, this is not done, since the group must be allowed to delete the
|
|
|
|
- file.
|
|
|
|
-}
|
|
|
|
freezeContentDir :: FilePath -> Annex ()
|
|
|
|
freezeContentDir file = liftIO . go =<< fromRepo getSharedRepository
|
|
|
|
where
|
|
|
|
dir = parentDir file
|
|
|
|
go GroupShared = groupWriteRead dir
|
|
|
|
go AllShared = groupWriteRead dir
|
|
|
|
go _ = preventWrite dir
|
|
|
|
|
2012-04-21 20:59:49 +00:00
|
|
|
{- Makes the directory tree to store an annexed file's content,
|
|
|
|
- with appropriate permissions on each level. -}
|
|
|
|
createContentDir :: FilePath -> Annex ()
|
|
|
|
createContentDir dest = do
|
|
|
|
unlessM (liftIO $ doesDirectoryExist dir) $
|
|
|
|
createAnnexDirectory dir
|
|
|
|
-- might have already existed with restricted perms
|
|
|
|
liftIO $ allowWrite dir
|
|
|
|
where
|
|
|
|
dir = parentDir dest
|