From 5344c54a72c590e9afc822074633e75931374ca0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 2 Feb 2014 19:57:22 -0400 Subject: sync --content: Reuse smart copy code from copy command, including handling and repairing out of date location tracking info. Closes: #737480 --- Command/Sync.hs | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'Command/Sync.hs') diff --git a/Command/Sync.hs b/Command/Sync.hs index 5bc412cc9..ce1faa7f5 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -34,8 +34,7 @@ import Git.FileMode import Annex.Wanted import Annex.Content import Command.Get (getKeyFile') -import Logs.Transfer -import Logs.Presence +import qualified Command.Move import Logs.Location import Annex.Drop @@ -558,11 +557,5 @@ syncFile rs f (k, _) = do put dest = do ok <- commandAction $ do showStart "copy" f - showAction $ "to " ++ Remote.name dest - next $ next $ do - ok <- upload (Remote.uuid dest) k (Just f) noRetry $ - Remote.storeKey dest k (Just f) - when ok $ - Remote.logStatus dest k InfoPresent - return ok + next $ Command.Move.toPerform dest False k (Just f) return (ok, if ok then Just (Remote.uuid dest) else Nothing) -- cgit v1.2.3