summaryrefslogtreecommitdiff
path: root/Upgrade
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-03-21 20:46:43 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-03-21 20:48:58 -0400
commitc048905dc4c2ce155dbb03d7e60014568faa9553 (patch)
tree39f3ba6d18bd7b14931c191d05ca120a7ee7d5bd /Upgrade
parent02c3f3880b3663508bf291e0ac5b4fb44c8e1eee (diff)
upgrade messages
Diffstat (limited to 'Upgrade')
-rw-r--r--Upgrade/V0.hs2
-rw-r--r--Upgrade/V1.hs5
2 files changed, 5 insertions, 2 deletions
diff --git a/Upgrade/V0.hs b/Upgrade/V0.hs
index 5ba305817..eabd03009 100644
--- a/Upgrade/V0.hs
+++ b/Upgrade/V0.hs
@@ -23,7 +23,7 @@ import qualified Upgrade.V1
upgrade :: Annex Bool
upgrade = do
- showSideAction "Upgrading object directory layout v0 to v1..."
+ showNote "v0 to v1..."
g <- Annex.gitRepo
-- do the reorganisation of the key files
diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs
index 43f279ad0..f18a76c87 100644
--- a/Upgrade/V1.hs
+++ b/Upgrade/V1.hs
@@ -55,7 +55,7 @@ import qualified Command.Init
upgrade :: Annex Bool
upgrade = do
- showSideAction "Upgrading object directory layout v1 to v2..."
+ showNote "v1 to v2"
g <- Annex.gitRepo
if Git.repoIsLocalBare g
@@ -78,6 +78,7 @@ upgrade = do
moveContent :: Annex ()
moveContent = do
+ showNote "moving content..."
keys <- getKeysPresent1
forM_ keys move
where
@@ -92,6 +93,7 @@ moveContent = do
updateSymlinks :: Annex ()
updateSymlinks = do
+ showNote "updating symlinks content..."
g <- Annex.gitRepo
files <- liftIO $ Git.inRepo g [Git.workTree g]
forM_ files $ fixlink
@@ -109,6 +111,7 @@ updateSymlinks = do
moveLocationLogs :: Annex ()
moveLocationLogs = do
+ showNote "moving location logs..."
logkeys <- oldlocationlogs
forM_ logkeys move
where