This commit is contained in:
Joey Hess 2010-11-04 13:40:00 -04:00
parent cc4794ce85
commit 6b80356f6d

View file

@ -10,7 +10,6 @@ module CmdLine (parseCmd) where
import System.Console.GetOpt import System.Console.GetOpt
import Control.Monad.State (liftIO) import Control.Monad.State (liftIO)
import System.Directory import System.Directory
import Data.String.Utils
import Control.Monad (filterM) import Control.Monad (filterM)
import Monad (when) import Monad (when)
@ -19,7 +18,6 @@ import qualified Annex
import Locations import Locations
import qualified Backend import qualified Backend
import Types import Types
import Core
import Command import Command
import qualified Command.Add import qualified Command.Add
@ -91,7 +89,7 @@ options = [
storestring n s = Annex.flagChange n $ FlagString s storestring n s = Annex.flagChange n $ FlagString s
header :: String header :: String
header = "Usage: git-annex " ++ (join "|" $ map subcmdname subCmds) header = "Usage: git-annex subcommand [option ..]"
{- Usage message with lists of options and subcommands. -} {- Usage message with lists of options and subcommands. -}
usage :: String usage :: String
@ -142,7 +140,7 @@ withKeys a params = return $ map a params
withTempFile :: SubCmdSeekStrings withTempFile :: SubCmdSeekStrings
withTempFile a params = return $ map a params withTempFile a params = return $ map a params
withNothing :: SubCmdSeekNothing withNothing :: SubCmdSeekNothing
withNothing a params = return [a] withNothing a _ = return [a]
{- filter out files from the state directory -} {- filter out files from the state directory -}
notState :: FilePath -> Bool notState :: FilePath -> Bool