From fff817f70ce3c86d873775c0d113b074cc486ff8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 3 Apr 2015 13:51:32 -0400 Subject: rename showProgress -> showProgressDots --- Messages.hs | 6 +++--- Upgrade/V2.hs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Messages.hs b/Messages.hs index 88a4a8c18..a8816218c 100644 --- a/Messages.hs +++ b/Messages.hs @@ -10,7 +10,7 @@ module Messages ( showStart', showNote, showAction, - showProgress, + showProgressDots, metered, meteredBytes, showSideAction, @@ -69,8 +69,8 @@ showAction :: String -> Annex () showAction s = showNote $ s ++ "..." {- Progress dots. -} -showProgress :: Annex () -showProgress = handle q $ +showProgressDots :: Annex () +showProgressDots = handle q $ flushed $ putStr "." {- Shows a progress meter while performing a transfer of a key. diff --git a/Upgrade/V2.hs b/Upgrade/V2.hs index 0f09205ff..71ac8f7fa 100644 --- a/Upgrade/V2.hs +++ b/Upgrade/V2.hs @@ -44,7 +44,7 @@ upgrade = do old <- fromRepo olddir Annex.Branch.create - showProgress + showProgressDots e <- liftIO $ doesDirectoryExist old when e $ do @@ -53,12 +53,12 @@ upgrade = do mapM_ (\f -> inject f f) =<< logFiles old saveState False - showProgress + showProgressDots when e $ do inRepo $ Git.Command.run [Param "rm", Param "-r", Param "-f", Param "-q", File old] unless bare $ inRepo gitAttributesUnWrite - showProgress + showProgressDots unless bare push -- cgit v1.2.3