summaryrefslogtreecommitdiff
path: root/Command/Unlock.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/Unlock.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/Unlock.hs')
-rw-r--r--Command/Unlock.hs17
1 files changed, 9 insertions, 8 deletions
diff --git a/Command/Unlock.hs b/Command/Unlock.hs
index a1b1ce411..98117f5b5 100644
--- a/Command/Unlock.hs
+++ b/Command/Unlock.hs
@@ -13,14 +13,15 @@ import Annex.Content
import Annex.CatFile
import Utility.CopyFile
-cmd :: [Command]
-cmd =
- [ c "unlock" "unlock files for modification"
- , c "edit" "same as unlock"
- ]
- where
- c n = notDirect . withOptions annexedMatchingOptions
- . command n paramPaths seek SectionCommon
+cmd :: Command
+cmd = mkcmd "unlock" "unlock files for modification"
+
+editcmd :: Command
+editcmd = mkcmd "edit" "same as unlock"
+
+mkcmd :: String -> String -> Command
+mkcmd n = notDirect . withOptions annexedMatchingOptions
+ . command n paramPaths seek SectionCommon
seek :: CommandSeek
seek = withFilesInGit $ whenAnnexed start