mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

better warnings display

Browse source
This commit is contained in:
Joey Hess 2011-01-26 20:30:07 -04:00
parent 3cb5cb6bf6
commit c30d38e108
3 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Messages.hs
View file

@ -37,9 +37,8 @@ showProgress :: Annex ()
showProgress = verbose $ liftIO $ putStr "\n"
showLongNote :: String -> Annex ()
showLongNote s = verbose $ liftIO $ putStr $ "\n" ++ indented
where
indented = join "\n" $ map (\l -> " " ++ l) $ lines s
showLongNote s = verbose $ liftIO $ putStr $ "\n" ++ indent s
showEndOk :: Annex ()
showEndOk = verbose $ liftIO $ putStrLn "ok"
@ -48,9 +47,13 @@ showEndFail = verbose $ liftIO $ putStrLn "\nfailed"
{- Exception pretty-printing. -}
showErr :: (Show a) => a -> Annex ()
showErr e = warning $ show e
showErr e = warning $ "git-annex: " ++ show e
warning :: String -> Annex ()
warning s = do
warning w = do
verbose $ liftIO $ putStr "\n"
liftIO $ hPutStrLn stderr $ "git-annex: " ++ s ++ " "
liftIO $ hFlush stdout
liftIO $ hPutStrLn stderr $ indent w
indent :: String -> String
indent s = join "\n" $ map (\l -> " " ++ l) $ lines s