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

rename showProgress -> showProgressDots

Browse source
This commit is contained in:
Joey Hess 2015-04-03 13:51:32 -04:00
parent ea90722aba
commit bc0180da83
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Messages.hs
View file

@ -10,7 +10,7 @@ module Messages (
showStart', showStart',
showNote, showNote,
showAction, showAction,
showProgress, showProgressDots,
metered, metered,
meteredBytes, meteredBytes,
showSideAction, showSideAction,
@ -69,8 +69,8 @@ showAction :: String -> Annex ()
showAction s = showNote $ s ++ "..." showAction s = showNote $ s ++ "..."
{- Progress dots. -} {- Progress dots. -}
showProgress :: Annex () showProgressDots :: Annex ()
showProgress = handle q $ showProgressDots = handle q $
flushed $ putStr "." flushed $ putStr "."
{- Shows a progress meter while performing a transfer of a key. {- Shows a progress meter while performing a transfer of a key.

6
Upgrade/V2.hs
View file

@ -44,7 +44,7 @@ upgrade = do
old <- fromRepo olddir old <- fromRepo olddir
Annex.Branch.create Annex.Branch.create
showProgress showProgressDots
e <- liftIO $ doesDirectoryExist old e <- liftIO $ doesDirectoryExist old
when e $ do when e $ do
@ -53,12 +53,12 @@ upgrade = do
mapM_ (\f -> inject f f) =<< logFiles old mapM_ (\f -> inject f f) =<< logFiles old
saveState False saveState False
showProgress showProgressDots
when e $ do when e $ do
inRepo $ Git.Command.run [Param "rm", Param "-r", Param "-f", Param "-q", File old] inRepo $ Git.Command.run [Param "rm", Param "-r", Param "-f", Param "-q", File old]
unless bare $ inRepo gitAttributesUnWrite unless bare $ inRepo gitAttributesUnWrite
showProgress showProgressDots
unless bare push unless bare push