make Migrate use ReKey rather than the other way around

as ReKey is plumbing, this makes sense

3 files changed, 28 insertions, 30 deletions

diff --git a/Command/Migrate.hs b/Command/Migrate.hs
index 795ecc265..b837ef827 100644
--- a/Command/Migrate.hs
+++ b/Command/Migrate.hs
@@ -12,8 +12,7 @@ import Command
 import qualified Backend
 import qualified Types.Key
 import Annex.Content
-import qualified Command.Add
-import Logs.Web
+import qualified Command.ReKey
 
 def :: [Command]
 def = [command "migrate" paramPaths seek "switch data to different backend"]
@@ -58,27 +57,8 @@ perform file oldkey newbackend = do
 	cleantmp tmpfile
 	case k of
 		Nothing -> stop
-		Just (newkey, _) -> stopUnless (linkKey src newkey) $
-			next $ cleanup file oldkey newkey
+		Just (newkey, _) ->
+			stopUnless (Command.ReKey.linkKey oldkey newkey) $
+				next $ Command.ReKey.cleanup file oldkey newkey
 	where
 		cleantmp t = liftIO $ whenM (doesFileExist t) $ removeFile t
-
-linkKey :: FilePath -> Key -> Annex Bool
-linkKey src newkey = getViaTmpUnchecked newkey $ \t -> do
-	-- Make a hard link to the old backend's
-	-- cached key, to avoid wasting disk space.
-	liftIO $ unlessM (doesFileExist t) $ createLink src t
-	return True
-
-cleanup :: FilePath -> Key -> Key -> CommandCleanup
-cleanup file oldkey newkey = do
-	-- Update symlink to use the new key.
-	liftIO $ removeFile file
-
-	-- If the old key had some associated urls, record them for
-	-- the new key as well.
-	urls <- getUrls oldkey
-	unless (null urls) $
-		mapM_ (setUrlPresent newkey) urls
-
-	Command.Add.cleanup file newkey True
diff --git a/Command/ReKey.hs b/Command/ReKey.hs
index 9c3625aef..644e84382 100644
--- a/Command/ReKey.hs
+++ b/Command/ReKey.hs
@@ -12,7 +12,8 @@ import Command
 import qualified Annex
 import Types.Key
 import Annex.Content
-import qualified Command.Migrate
+import qualified Command.Add
+import Logs.Web
 
 def :: [Command]
 def = [command "rekey"
@@ -36,11 +37,29 @@ perform :: FilePath -> Key -> Key -> CommandPerform
 perform file oldkey newkey = do
 	present <- inAnnex oldkey
 	_ <- if present
-		then do
-			src <- inRepo $ gitAnnexLocation oldkey
-			Command.Migrate.linkKey src newkey
+		then linkKey oldkey newkey
 		else do
 			unlessM (Annex.getState Annex.force) $
 				error $ file ++ " is not available (use --force to override)"
 			return True
-	next $ Command.Migrate.cleanup file oldkey newkey
+	next $ cleanup file oldkey newkey
+
+{- Make a hard link to the old key content, to avoid wasting disk space. -}
+linkKey :: Key -> Key -> Annex Bool
+linkKey oldkey newkey = getViaTmpUnchecked newkey $ \t -> do
+	src <- inRepo $ gitAnnexLocation oldkey
+	liftIO $ unlessM (doesFileExist t) $ createLink src t
+	return True
+
+cleanup :: FilePath -> Key -> Key -> CommandCleanup
+cleanup file oldkey newkey = do
+	-- Update symlink to use the new key.
+	liftIO $ removeFile file
+
+	-- If the old key had some associated urls, record them for
+	-- the new key as well.
+	urls <- getUrls oldkey
+	unless (null urls) $
+		mapM_ (setUrlPresent newkey) urls
+
+	Command.Add.cleanup file newkey True
diff --git a/Usage.hs b/Usage.hs
index a1b47252d..59223daae 100644
--- a/Usage.hs
+++ b/Usage.hs
@@ -11,7 +11,6 @@ import Common.Annex
 import System.Console.GetOpt
 
 import Types.Command
-import Types.Option
 
 {- Usage message with lists of commands and options. -}
 usage :: String -> [Command] -> [Option] -> String