mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

cleanup3

Browse source
This commit is contained in:
Joey Hess 2010-10-13 03:51:55 -04:00
parent ff998a9a67
commit 1dbf36bf9a
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Annex.hs
View file

@ -24,10 +24,6 @@ import UUID
import LocationLog import LocationLog
import Types import Types
{- Checks if a given key is currently present in the annexLocation -}
inAnnex :: State -> Backend -> Key -> IO Bool
inAnnex state backend key = doesFileExist $ annexLocation state backend key
{- On startup, examine the git repo, prepare it, and record state for {- On startup, examine the git repo, prepare it, and record state for
- later. -} - later. -}
startAnnex :: IO State startAnnex :: IO State
@ -89,7 +85,6 @@ unannexFile :: State -> FilePath -> IO ()
unannexFile state file = notinBackend file err $ \(key, backend) -> do unannexFile state file = notinBackend file err $ \(key, backend) -> do
dropFile state backend key dropFile state backend key
logStatus state key ValueMissing logStatus state key ValueMissing
let src = annexLocation state backend key
removeFile file removeFile file
gitRun (repo state) ["rm", file] gitRun (repo state) ["rm", file]
gitRun (repo state) ["commit", "-m", gitRun (repo state) ["commit", "-m",
@ -97,12 +92,13 @@ unannexFile state file = notinBackend file err $ \(key, backend) -> do
-- git rm deletes empty directories; -- git rm deletes empty directories;
-- put them back -- put them back
createDirectoryIfMissing True (parentDir file) createDirectoryIfMissing True (parentDir file)
let src = annexLocation state backend key
renameFile src file renameFile src file
return () return ()
where where
err = error $ "not annexed " ++ file err = error $ "not annexed " ++ file
{- Transfers the file from a remote. -} {- Gets an annexed file from one of the backends. -}
annexGetFile :: State -> FilePath -> IO () annexGetFile :: State -> FilePath -> IO ()
annexGetFile state file = notinBackend file err $ \(key, backend) -> do annexGetFile state file = notinBackend file err $ \(key, backend) -> do
inannex <- inAnnex state backend key inannex <- inAnnex state backend key
@ -165,3 +161,7 @@ logStatus state key status = do
f <- logChange (repo state) key (getUUID (repo state)) status f <- logChange (repo state) key (getUUID (repo state)) status
gitRun (repo state) ["add", f] gitRun (repo state) ["add", f]
gitRun (repo state) ["commit", "-m", "git-annex log update", f] gitRun (repo state) ["commit", "-m", "git-annex log update", f]
{- Checks if a given key is currently present in the annexLocation -}
inAnnex :: State -> Backend -> Key -> IO Bool
inAnnex state backend key = doesFileExist $ annexLocation state backend key