better option handling

multiple-file support for all modes

1 files changed, 25 insertions, 4 deletions

diff --git a/git-annex.hs b/git-annex.hs
index 2c9b1315f..22fbe60ca 100644
--- a/git-annex.hs
+++ b/git-annex.hs
@@ -1,16 +1,37 @@
 {- git-annex main program
  - -}
 
+import System.IO
 import System.Environment
-import GitRepo
+import Control.Exception
 import CmdLine
 import Annex
-import BackendList
 
 main = do
 	args <- getArgs
-	flags <- argvToFlags args
+	(mode, files) <- argvToMode args
 	
 	state <- startAnnex
 
-	mapM (\f -> dispatch f state) flags
+	tryRun 0 $ map (\f -> dispatch state mode f) files
+
+{- Tries to run a series of actions, not stopping if some error out,
+ - and propigating an overall error status at the end. -}
+tryRun errflag [] = do
+	if (errflag > 0)
+		then error "unsuccessful"
+		else return ()
+tryRun errflag (a:as) = do
+	result <- try (a)::IO (Either SomeException ())
+	case (result) of
+		Left err -> do
+			showErr err
+			tryRun 1 as
+		Right _ -> tryRun errflag as
+
+{- Exception pretty-printing. -}
+showErr :: SomeException -> IO ()
+showErr e = do
+	let err = show e
+	hPutStrLn stderr $ "git-annex: " ++ err
+	return ()