summaryrefslogtreecommitdiff
path: root/Command/DropUnused.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-01-06 03:06:25 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-01-06 03:16:42 -0400
commit0a36f92a31196451c2d838fd0ae15527e8bbce18 (patch)
tree54e2a90339ad3d24dbc3d0599a580db63b25ed32 /Command/DropUnused.hs
parent2051d804625be0c19e277764ab9820b428a5d2b3 (diff)
more command-specific options
Made --from and --to command-specific options. Added generic storage for values of command-specific options, which allows removing some of the special case fields in AnnexState. (Also added generic storage for command-specific flags, although there are not yet any.) Note that this storage uses a Map, so repeatedly looking up the same value is slightly more expensive than looking up an AnnexState field. But, the value can be looked up once in the seek stage, transformed as necessary, and passed in a closure to the start stage, and this avoids that overhead. Still, I'm hesitant to use this for things like force or fast flags. It's probably best to reserve it for flags that are only used by a few commands, or options like --from and --to that it's important only be allowed to be used with commands that implement them, to avoid user confusion.
Diffstat (limited to 'Command/DropUnused.hs')
-rw-r--r--Command/DropUnused.hs7
1 files changed, 4 insertions, 3 deletions
diff --git a/Command/DropUnused.hs b/Command/DropUnused.hs
index 244f378d9..fd3e84fe5 100644
--- a/Command/DropUnused.hs
+++ b/Command/DropUnused.hs
@@ -20,8 +20,9 @@ import Types.Key
type UnusedMap = M.Map String Key
def :: [Command]
-def = [dontCheck fromOpt $ command "dropunused" (paramRepeating paramNumber)
- seek "drop unused file content"]
+def = [withOptions [Command.Drop.fromOption] $
+ command "dropunused" (paramRepeating paramNumber)
+ seek "drop unused file content"]
seek :: [CommandSeek]
seek = [withUnusedMaps]
@@ -50,7 +51,7 @@ start (unused, unusedbad, unusedtmp) s = search
next $ a key
perform :: Key -> CommandPerform
-perform key = maybe droplocal dropremote =<< Annex.getState Annex.fromremote
+perform key = maybe droplocal dropremote =<< Annex.getField "from"
where
dropremote name = do
r <- Remote.byName name