2012-05-02 18:59:05 +00:00
|
|
|
|
{- git-annex command
|
|
|
|
|
|
-
|
2015-01-21 16:50:09 +00:00
|
|
|
|
- Copyright 2012 Joey Hess <id@joeyh.name>
|
2012-05-02 18:59:05 +00:00
|
|
|
|
-
|
2019-03-13 19:48:14 +00:00
|
|
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
2012-05-02 18:59:05 +00:00
|
|
|
|
-}
|
|
|
|
|
|
|
2020-11-03 14:11:04 +00:00
|
|
|
|
{-# LANGUAGE OverloadedStrings #-}
|
|
|
|
|
|
|
2012-05-02 18:59:05 +00:00
|
|
|
|
module Command.AddUnused where
|
|
|
|
|
|
|
2013-04-11 17:35:52 +00:00
|
|
|
|
import Logs.Location
|
2012-05-02 18:59:05 +00:00
|
|
|
|
import Command
|
2015-12-22 17:23:33 +00:00
|
|
|
|
import Annex.Ingest
|
2013-07-03 19:26:59 +00:00
|
|
|
|
import Command.Unused (withUnusedMaps, UnusedMaps(..), startUnused)
|
2012-05-02 18:59:05 +00:00
|
|
|
|
|
2015-07-08 16:33:27 +00:00
|
|
|
|
cmd :: Command
|
2019-08-26 19:52:19 +00:00
|
|
|
|
cmd = command "addunused" SectionMaintenance
|
|
|
|
|
|
"add back unused files"
|
|
|
|
|
|
(paramRepeating paramNumRange) (withParams seek)
|
2012-05-02 18:59:05 +00:00
|
|
|
|
|
2015-07-08 19:08:02 +00:00
|
|
|
|
seek :: CmdParams -> CommandSeek
|
fix inversion of control in CommandSeek (no behavior changes)
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.
2014-01-20 08:11:42 +00:00
|
|
|
|
seek = withUnusedMaps start
|
2012-05-02 18:59:05 +00:00
|
|
|
|
|
|
|
|
|
|
start :: UnusedMaps -> Int -> CommandStart
|
2012-12-29 18:28:19 +00:00
|
|
|
|
start = startUnused "addunused" perform
|
|
|
|
|
|
(performOther "bad")
|
|
|
|
|
|
(performOther "tmp")
|
2012-05-02 18:59:05 +00:00
|
|
|
|
|
|
|
|
|
|
perform :: Key -> CommandPerform
|
2013-04-11 17:35:52 +00:00
|
|
|
|
perform key = next $ do
|
|
|
|
|
|
logStatus key InfoPresent
|
Added --no-check-gitignore option for finer grained control than using --force.
add, addurl, importfeed, import: Added --no-check-gitignore option
for finer grained control than using --force.
(--force is used for too many different things, and at least one
of these also uses it for something else. I would like to reduce
--force's footprint until it only forces drops or a few other data
losses. For now, --force still disables checking ignores too.)
addunused: Don't check .gitignores when adding files. This is a behavior
change, but I justify it by analogy with git add of a gitignored file
adding it, asking to add all unused files back should add them all back,
not skip some. The old behavior was surprising.
In Command.Lock and Command.ReKey, CheckGitIgnore False does not change
behavior, it only makes explicit what is done. Since these commands are run
on annexed files, the file is already checked into git, so git add won't
check ignores.
2020-09-18 17:12:04 +00:00
|
|
|
|
-- Ignore the usual git ignores because the user has explictly
|
|
|
|
|
|
-- asked to add these files.
|
|
|
|
|
|
addLink (CheckGitIgnore False) file key Nothing
|
2013-04-11 17:35:52 +00:00
|
|
|
|
return True
|
2012-11-12 05:05:04 +00:00
|
|
|
|
where
|
2020-11-03 14:11:04 +00:00
|
|
|
|
file = "unused." <> keyFile key
|
2012-05-02 18:59:05 +00:00
|
|
|
|
|
|
|
|
|
|
{- 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
|
2016-11-16 01:29:54 +00:00
|
|
|
|
performOther other _ = giveup $ "cannot addunused " ++ other ++ "content"
|