summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-04-03 13:51:32 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-04-03 13:51:32 -0400
commitfff817f70ce3c86d873775c0d113b074cc486ff8 (patch)
treed5928753dd737992fc94f468428041b32485479b
parent9aa8eea09d5c663f1999ce17b44c21fad395b57c (diff)
rename showProgress -> showProgressDots
-rw-r--r--Messages.hs6
-rw-r--r--Upgrade/V2.hs6
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