reject batch options combined with non-batch options
Reject combinations of --batch (or --batch-keys) with options like --all or --key or with filenames. Most commands ignored the non-batch items when batch mode was enabled. For some reason, addurl and dropkey both processed first the specified non-batch items, followed by entering batch mode. Changed them to also error out, for consistency. Sponsored-by: Dartmouth College's Datalad project
This commit is contained in:
parent
56a12eb84c
commit
835c50966a
19 changed files with 50 additions and 27 deletions
|
@ -33,11 +33,11 @@ seek :: DropKeyOptions -> CommandSeek
|
|||
seek o = do
|
||||
unlessM (Annex.getState Annex.force) $
|
||||
giveup "dropkey can cause data loss; use --force if you're sure you want to do this"
|
||||
withKeys (commandAction . start) (toDrop o)
|
||||
case batchOption o of
|
||||
Batch fmt -> batchInput fmt (pure . parsekey) $
|
||||
batchCommandAction . start
|
||||
NoBatch -> noop
|
||||
NoBatch -> withKeys (commandAction . start) (toDrop o)
|
||||
Batch fmt -> batchOnly Nothing (toDrop o) $
|
||||
batchInput fmt (pure . parsekey) $
|
||||
batchCommandAction . start
|
||||
where
|
||||
parsekey = maybe (Left "bad key") Right . deserializeKey
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue