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

drop: Add --batch and --json options.

Browse source
This commit is contained in:
Joey Hess 2016-07-06 11:54:46 -04:00
parent a0d6ec1c8a
commit 5171e98988
Failed to extract signature
5 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Command/Drop.hs
View file

@ -23,7 +23,7 @@ import System.Log.Logger (debugM)
import qualified Data.Set as S
cmd :: Command
cmd = withGlobalOptions (jobsOption : annexedMatchingOptions) $
cmd = withGlobalOptions (jobsOption : jsonOption : annexedMatchingOptions) $
command "drop" SectionCommon
"remove content of files from repository"
paramPaths (seek <$$> optParser)
@ -33,6 +33,7 @@ data DropOptions = DropOptions
, dropFrom :: Maybe (DeferredParse Remote)
, autoMode :: Bool
, keyOptions :: Maybe KeyOptions
, batchOption :: BatchMode
}
optParser :: CmdParamsDesc -> Parser DropOptions
@ -41,6 +42,7 @@ optParser desc = DropOptions
<*> optional parseDropFromOption
<*> parseAutoOption
<*> optional (parseKeyOptions False)
<*> parseBatchOption
parseDropFromOption :: Parser (DeferredParse Remote)
parseDropFromOption = parseRemoteOption $ strOption
@ -51,10 +53,14 @@ parseDropFromOption = parseRemoteOption $ strOption
seek :: DropOptions -> CommandSeek
seek o = allowConcurrentOutput $
withKeyOptions (keyOptions o) (autoMode o)
(startKeys o)
(withFilesInGit $ whenAnnexed $ start o)
(dropFiles o)
case batchOption o of
Batch -> batchInput Right (batchCommandAction . go)
NoBatch -> withKeyOptions (keyOptions o) (autoMode o)
(startKeys o)
(withFilesInGit go)
(dropFiles o)
where
go = whenAnnexed $ start o
start :: DropOptions -> FilePath -> Key -> CommandStart
start o file key = start' o key (Just file)