refactor

2 files changed, 39 insertions, 36 deletions

diff --git a/CmdLine.hs b/CmdLine.hs
index 494da2873..98bdab12f 100644
--- a/CmdLine.hs
+++ b/CmdLine.hs
@@ -33,12 +33,6 @@ import qualified Command.SetKey
 import qualified Command.Fix
 import qualified Command.Init
 
-data SubCommand = SubCommand {
-	subcmdname :: String,
-	subcmdparams :: String,
-	subcmdseek :: SubCmdSeek,
-	subcmddesc :: String
-}
 subCmds :: [SubCommand]
 subCmds =  [
 	  (SubCommand "add" path	(withFilesNotInGit Command.Add.start)
@@ -109,35 +103,6 @@ usage = usageInfo header options ++ "\nSubcommands:\n" ++ cmddescs
 		indent l = "  " ++ l
 		pad n s = take (n - (length s)) $ repeat ' '
 
-{- Prepares a list of actions to run to perform a subcommand, based on
- - the parameters passed to it. -}
-prepSubCmd :: SubCommand -> AnnexState -> [String] -> IO [Annex Bool]
-prepSubCmd SubCommand { subcmdseek = seek } state params = do
-	list <- Annex.eval state $ seek params
-	return $ map (\a -> doSubCmd a) list
-
-{- Runs a subcommand through the start, perform and cleanup stages -}
-doSubCmd :: SubCmdStart -> SubCmdCleanup
-doSubCmd start = do
-	s <- start
-	case (s) of
-		Nothing -> return True
-		Just perform -> do
-			p <- perform
-			case (p) of
-				Nothing -> do
-					showEndFail
-					return False
-				Just cleanup -> do
-					c <- cleanup
-					if (c)
-						then do
-							showEndOk
-							return True
-						else do
-							showEndFail
-							return False
-
 {- These functions find appropriate files or other things based on a
    user's parameters. -}
 withFilesNotInGit :: SubCmdSeekBackendFiles
diff --git a/Command.hs b/Command.hs
index 3d1e75e5f..47c73370f 100644
--- a/Command.hs
+++ b/Command.hs
@@ -8,7 +8,9 @@
 module Command where
 
 import Types
-import Backend
+import qualified Backend
+import Core
+import qualified Annex
 
 {- A subcommand runs in four stages.
  -
@@ -35,6 +37,42 @@ type SubCmdStartString = String -> SubCmdStart
 type SubCmdSeekBackendFiles = SubCmdStartBackendFile -> SubCmdSeek
 type SubCmdStartBackendFile = (FilePath, Maybe Backend) -> SubCmdStart
 
+data SubCommand = SubCommand {
+	subcmdname :: String,
+	subcmdparams :: String,
+	subcmdseek :: SubCmdSeek,
+	subcmddesc :: String
+}
+
+{- Prepares a list of actions to run to perform a subcommand, based on
+ - the parameters passed to it. -}
+prepSubCmd :: SubCommand -> AnnexState -> [String] -> IO [Annex Bool]
+prepSubCmd SubCommand { subcmdseek = seek } state params = do
+	list <- Annex.eval state $ seek params
+	return $ map (\a -> doSubCmd a) list
+
+{- Runs a subcommand through the start, perform and cleanup stages -}
+doSubCmd :: SubCmdStart -> SubCmdCleanup
+doSubCmd start = do
+	s <- start
+	case (s) of
+		Nothing -> return True
+		Just perform -> do
+			p <- perform
+			case (p) of
+				Nothing -> do
+					showEndFail
+					return False
+				Just cleanup -> do
+					c <- cleanup
+					if (c)
+						then do
+							showEndOk
+							return True
+						else do
+							showEndFail
+							return False
+
 notAnnexed :: FilePath -> Annex (Maybe a) -> Annex (Maybe a)
 notAnnexed file a = do
 	r <- Backend.lookupFile file