Merge branch 'master' into concurrentprogress
Conflicts: Command/Fsck.hs Messages.hs Remote/Directory.hs Remote/Git.hs Remote/Helper/Special.hs Types/Remote.hs debian/changelog git-annex.cabal
This commit is contained in:
commit
e27b97d364
378 changed files with 4978 additions and 1158 deletions
15
Messages.hs
15
Messages.hs
|
@ -20,7 +20,7 @@ module Messages (
|
|||
showEndFail,
|
||||
showEndResult,
|
||||
endResult,
|
||||
showErr,
|
||||
toplevelWarning,
|
||||
warning,
|
||||
warningIO,
|
||||
indent,
|
||||
|
@ -118,15 +118,16 @@ endResult :: Bool -> String
|
|||
endResult True = "ok"
|
||||
endResult False = "failed"
|
||||
|
||||
showErr :: (Show a) => a -> Annex ()
|
||||
showErr e = warning' $ "git-annex: " ++ show e
|
||||
toplevelWarning :: Bool -> String -> Annex ()
|
||||
toplevelWarning makeway s = warning' makeway ("git-annex: " ++ s)
|
||||
|
||||
warning :: String -> Annex ()
|
||||
warning = warning' . indent
|
||||
warning = warning' True . indent
|
||||
|
||||
warning' :: String -> Annex ()
|
||||
warning' w = do
|
||||
handleMessage q $ putStr "\n"
|
||||
warning' :: Bool -> String -> Annex ()
|
||||
warning' makeway w = do
|
||||
when makeway $
|
||||
handleMessage q $ putStr "\n"
|
||||
liftIO $ do
|
||||
hFlush stdout
|
||||
hPutStrLn stderr w
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue