From e73914b7950ce9d26a3882472c7ab27260ff87f9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 8 Jul 2015 12:33:27 -0400 Subject: 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. --- Command/Unlock.hs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'Command/Unlock.hs') 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 -- cgit v1.2.3