aboutsummaryrefslogtreecommitdiff
path: root/Command/Unannex.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-07-08 12:33:27 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-07-08 13:36:25 -0400
commite73914b7950ce9d26a3882472c7ab27260ff87f9 (patch)
tree33d4a11106a005eadfe317505ea2786e83cf5bc8 /Command/Unannex.hs
parent8ce422d8ab390e105d70f049c30d81c14d3b64b4 (diff)
started converting to use optparse-applicative
This is a work in progress. It compiles and is able to do basic command dispatch, including git autocorrection, while using optparse-applicative for the core commandline parsing. * Many commands are temporarily disabled before conversion. * Options are not wired in yet. * cmdnorepo actions don't work yet. Also, removed the [Command] list, which was only used in one place.
Diffstat (limited to 'Command/Unannex.hs')
-rw-r--r--Command/Unannex.hs11
1 files changed, 6 insertions, 5 deletions
diff --git a/Command/Unannex.hs b/Command/Unannex.hs
index 0d88148c8..83e990921 100644
--- a/Command/Unannex.hs
+++ b/Command/Unannex.hs
@@ -22,12 +22,13 @@ import qualified Git.DiffTree as DiffTree
import Utility.CopyFile
import Command.PreCommit (lockPreCommitHook)
-cmd :: [Command]
-cmd = [withOptions annexedMatchingOptions $
- command "unannex" paramPaths seek SectionUtility
- "undo accidential add command"]
+cmd :: Command
+cmd = withOptions annexedMatchingOptions $
+ command "unannex" paramPaths SectionUtility
+ "undo accidential add command"
+ (commandParser seek)
-seek :: CommandSeek
+seek :: CmdParams -> CommandSeek
seek = wrapUnannex . (withFilesInGit $ whenAnnexed start)
wrapUnannex :: Annex a -> Annex a