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.
41 lines
1.1 KiB
Haskell
41 lines
1.1 KiB
Haskell
{- git-annex command
|
||
-
|
||
- Copyright 2012 Joey Hess <joey@kitenet.net>
|
||
-
|
||
- Licensed under the GNU GPL version 3 or higher.
|
||
-}
|
||
|
||
module Command.AddUnused where
|
||
|
||
import Common.Annex
|
||
import Logs.Location
|
||
import Command
|
||
import qualified Command.Add
|
||
import Command.Unused (withUnusedMaps, UnusedMaps(..), startUnused)
|
||
import Types.Key
|
||
|
||
def :: [Command]
|
||
def = [notDirect $ command "addunused" (paramRepeating paramNumRange)
|
||
seek SectionMaintenance "add back unused files"]
|
||
|
||
seek :: CommandSeek
|
||
seek = withUnusedMaps start
|
||
|
||
start :: UnusedMaps -> Int -> CommandStart
|
||
start = startUnused "addunused" perform
|
||
(performOther "bad")
|
||
(performOther "tmp")
|
||
|
||
perform :: Key -> CommandPerform
|
||
perform key = next $ do
|
||
logStatus key InfoPresent
|
||
Command.Add.addLink file key Nothing
|
||
return True
|
||
where
|
||
file = "unused." ++ key2file key
|
||
|
||
{- The content is not in the annex, but in another directory, and
|
||
- it seems better to error out, rather than moving bad/tmp content into
|
||
- the annex. -}
|
||
performOther :: String -> Key -> CommandPerform
|
||
performOther other _ = error $ "cannot addunused " ++ other ++ "content"
|