From c048905dc4c2ce155dbb03d7e60014568faa9553 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 21 Mar 2011 20:46:43 -0400
Subject: [PATCH] upgrade messages

---
 Command/Upgrade.hs | 2 ++
 Upgrade/V0.hs      | 2 +-
 Upgrade/V1.hs      | 5 ++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Command/Upgrade.hs b/Command/Upgrade.hs
index 94398c70a1..880a5324f7 100644
--- a/Command/Upgrade.hs
+++ b/Command/Upgrade.hs
@@ -10,6 +10,7 @@ module Command.Upgrade where
 import Command
 import Upgrade
 import Version
+import Messages
 
 command :: [Command]
 command = [standaloneCommand "upgrade" paramNothing seek
@@ -20,6 +21,7 @@ seek = [withNothing start]
 
 start :: CommandStartNothing
 start = do
+	showStart "upgrade" ""
 	r <- upgrade
 	checkVersion
 	return $ Just $ return $ Just $ return r
diff --git a/Upgrade/V0.hs b/Upgrade/V0.hs
index 5ba305817b..eabd030098 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 43f279ad08..f18a76c875 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