diff options
author | Joey Hess <joey@kitenet.net> | 2012-02-16 22:36:56 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-02-16 22:36:56 -0400 |
commit | 156a631f63eb0b2cee6a1b223d8e12ff8c62cb16 (patch) | |
tree | 8a48af241ea3c5601e5114cf11c3679e39c6fee3 /Command/ReKey.hs | |
parent | 69a0161c3afb9d6f7062ffac206044d95d3ee85a (diff) |
make Migrate use ReKey rather than the other way around
as ReKey is plumbing, this makes sense
Diffstat (limited to 'Command/ReKey.hs')
-rw-r--r-- | Command/ReKey.hs | 29 |
1 files changed, 24 insertions, 5 deletions
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 |