rekey: No longer copies over urls from the old to the new key.

It makes sense for migrate to do that, but not for this low-level (and
little used) plumbing command to.

3 files changed, 11 insertions, 9 deletions

diff --git a/Command/Migrate.hs b/Command/Migrate.hs
index 87e4772d1..f0100cdc2 100644
--- a/Command/Migrate.hs
+++ b/Command/Migrate.hs
@@ -18,6 +18,8 @@ import qualified Command.ReKey
 import qualified Command.Fsck
 import qualified Annex
 import Logs.MetaData
+import Logs.Web
+import qualified Remote
 
 cmd :: Command
 cmd = notDirect $ withGlobalOptions annexedMatchingOptions $
@@ -77,6 +79,12 @@ perform file oldkey oldbackend newbackend = go =<< genkey
 	finish newkey = ifM (Command.ReKey.linkKey file oldkey newkey)
 		( do
 			copyMetaData oldkey newkey
+			-- If the old key had some associated urls, record them for
+			-- the new key as well.
+			urls <- getUrls oldkey
+			forM_ urls $ \url -> do
+				r <- Remote.claimingUrl url
+				setUrlPresent (Remote.uuid r) newkey url
 			next $ Command.ReKey.cleanup file oldkey newkey
 		, error "failed"
 		)
diff --git a/Command/ReKey.hs b/Command/ReKey.hs
index 468d0dfe6..91329ec82 100644
--- a/Command/ReKey.hs
+++ b/Command/ReKey.hs
@@ -16,10 +16,8 @@ import Annex.Ingest
 import Annex.Link
 import Annex.Perms
 import Annex.ReplaceFile
-import Logs.Web
 import Logs.Location
 import Git.FilePath
-import qualified Remote
 import qualified Database.Keys
 import Annex.InodeSentinal
 import Utility.InodeCache
@@ -93,13 +91,6 @@ linkKey file oldkey newkey = ifM (isJust <$> isAnnexLink file)
 
 cleanup :: FilePath -> Key -> Key -> CommandCleanup
 cleanup file oldkey newkey = do
-	-- If the old key had some associated urls, record them for
-	-- the new key as well.
-	urls <- getUrls oldkey
-	forM_ urls $ \url -> do
-		r <- Remote.claimingUrl url
-		setUrlPresent (Remote.uuid r) newkey url
-
 	ifM (isJust <$> isAnnexLink file)
 		( do
 			-- Update symlink to use the new key.
diff --git a/debian/changelog b/debian/changelog
index af7bd0753..6ad211996 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,9 @@ git-annex (6.20151219) UNRELEASED; urgency=medium
     removed (but not git rmed). git still has the add staged in this case,
     so the content should not be unused and was wrongly treated as such.
   * migrate: Copy over metadata to new key.
+  * rekey: No longer copies over urls from the old to the new key.
+    It makes sense for migrate to do that, but not for this low-level
+    (and little used) plumbing command to.
 
  -- Joey Hess <id@joeyh.name>  Sat, 19 Dec 2015 13:31:17 -0400