converted Forget and TestRemote

1 files changed, 21 insertions, 19 deletions

diff --git a/Command/Forget.hs b/Command/Forget.hs
index 24789fe44..584b56f8a 100644
--- a/Command/Forget.hs
+++ b/Command/Forget.hs
@@ -16,28 +16,30 @@ import qualified Annex
 import Data.Time.Clock.POSIX
 
 cmd :: Command
-cmd = withOptions forgetOptions $ 
-	command "forget" SectionMaintenance 
-		"prune git-annex branch history"
-		paramNothing (withParams seek)
-
-forgetOptions :: [Option]
-forgetOptions = [dropDeadOption]
-
-dropDeadOption :: Option
-dropDeadOption = flagOption [] "drop-dead" "drop references to dead repositories"
-
-seek :: CmdParams -> CommandSeek
-seek ps = do
-	dropdead <- getOptionFlag dropDeadOption
-	withNothing (start dropdead) ps
-
-start :: Bool -> CommandStart
-start dropdead = do
+cmd = command "forget" SectionMaintenance 
+	"prune git-annex branch history"
+	paramNothing (seek <$$> optParser)
+
+data ForgetOptions = ForgetOptions
+	{ dropDead :: Bool
+	}
+
+optParser :: CmdParamsDesc -> Parser ForgetOptions
+optParser _ = ForgetOptions
+	<$> switch
+		( long "drop-dead"
+		<> help "drop references to dead repositories"
+		)
+
+seek :: ForgetOptions -> CommandSeek
+seek = commandAction . start
+
+start :: ForgetOptions -> CommandStart
+start o = do
 	showStart "forget" "git-annex"
 	now <- liftIO getPOSIXTime
 	let basets = addTransition now ForgetGitHistory noTransitions
-	let ts = if dropdead
+	let ts = if dropDead o
 		then addTransition now ForgetDeadRemotes basets
 		else basets
 	next $ perform ts =<< Annex.getState Annex.force