34c8af74ba
I've been disliking how the command seek actions were written for some time, with their inversion of control and ugly workarounds. The last straw to fix it was sync --content, which didn't fit the Annex [CommandStart] interface well at all. I have not yet made it take advantage of the changed interface though. The crucial change, and probably why I didn't do it this way from the beginning, is to make each CommandStart action be run with exceptions caught, and if it fails, increment a failure counter in annex state. So I finally remove the very first code I wrote for git-annex, which was before I had exception handling in the Annex monad, and so ran outside that monad, passing state explicitly as it ran each CommandStart action. This was a real slog from 1 to 5 am. Test suite passes. Memory usage is lower than before, sometimes by a couple of megabytes, and remains constant, even when running in a large repo, and even when repeatedly failing and incrementing the error counter. So no accidental laziness space leaks. Wall clock speed is identical, even in large repos. This commit was sponsored by an anonymous bitcoiner.
58 lines
1.4 KiB
Haskell
58 lines
1.4 KiB
Haskell
{- git-annex command
|
|
-
|
|
- Copyright 2011 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
module Command.Reinject where
|
|
|
|
import Common.Annex
|
|
import Command
|
|
import Logs.Location
|
|
import Annex.Content
|
|
import qualified Command.Fsck
|
|
|
|
def :: [Command]
|
|
def = [command "reinject" (paramPair "SRC" "DEST") seek
|
|
SectionUtility "sets content of annexed file"]
|
|
|
|
seek :: CommandSeek
|
|
seek = withWords start
|
|
|
|
start :: [FilePath] -> CommandStart
|
|
start (src:dest:[])
|
|
| src == dest = stop
|
|
| otherwise =
|
|
ifAnnexed src
|
|
(error $ "cannot used annexed file as src: " ++ src)
|
|
go
|
|
where
|
|
go = do
|
|
showStart "reinject" dest
|
|
next $ whenAnnexed (perform src) dest
|
|
start _ = error "specify a src file and a dest file"
|
|
|
|
perform :: FilePath -> FilePath -> (Key, Backend) -> CommandPerform
|
|
perform src _dest (key, backend) =
|
|
{- Check the content before accepting it. -}
|
|
ifM (Command.Fsck.checkKeySizeOr reject key src
|
|
<&&> Command.Fsck.checkBackendOr reject backend key src)
|
|
( do
|
|
unlessM move $ error "mv failed!"
|
|
next $ cleanup key
|
|
, error "not reinjecting"
|
|
)
|
|
where
|
|
-- the file might be on a different filesystem,
|
|
-- so mv is used rather than simply calling
|
|
-- moveToObjectDir; disk space is also
|
|
-- checked this way.
|
|
move = getViaTmp key $ \tmp ->
|
|
liftIO $ boolSystem "mv" [File src, File tmp]
|
|
reject = const $ return "wrong file?"
|
|
|
|
cleanup :: Key -> CommandCleanup
|
|
cleanup key = do
|
|
logStatus key InfoPresent
|
|
return True
|