summaryrefslogtreecommitdiff
path: root/Upgrade/V1.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-07-19 14:07:23 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-07-19 14:07:23 -0400
commit00153eed48a2328969cc08688ef674a4c19c2014 (patch)
treef2ee8ac90225d1d2329f45b43061b53b7757d815 /Upgrade/V1.hs
parentec9e9343d9fa99b0786ee93ff142484e2402d3c8 (diff)
unify elipsis handling
And add a simple dots-based progress display, currently only used in v2 upgrade.
Diffstat (limited to 'Upgrade/V1.hs')
-rw-r--r--Upgrade/V1.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs
index 8a3d37a64..c41310880 100644
--- a/Upgrade/V1.hs
+++ b/Upgrade/V1.hs
@@ -58,7 +58,7 @@ import qualified Upgrade.V2
upgrade :: Annex Bool
upgrade = do
- showNote "v1 to v2"
+ showAction "v1 to v2"
g <- Annex.gitRepo
if Git.repoIsLocalBare g
@@ -77,7 +77,7 @@ upgrade = do
moveContent :: Annex ()
moveContent = do
- showNote "moving content..."
+ showAction "moving content"
files <- getKeyFilesPresent1
forM_ files move
where
@@ -91,7 +91,7 @@ moveContent = do
updateSymlinks :: Annex ()
updateSymlinks = do
- showNote "updating symlinks..."
+ showAction "updating symlinks"
g <- Annex.gitRepo
files <- liftIO $ LsFiles.inRepo g [Git.workTree g]
forM_ files fixlink
@@ -108,7 +108,7 @@ updateSymlinks = do
moveLocationLogs :: Annex ()
moveLocationLogs = do
- showNote "moving location logs..."
+ showAction "moving location logs"
logkeys <- oldlocationlogs
forM_ logkeys move
where