sync --content: Reuse smart copy code from copy command, including handling and repairing out of date location tracking info. Closes: #737480

Command/Sync.hs

@@ -34,8 +34,7 @@ import Git.FileMode
 import Annex.Wanted
 import Annex.Content
 import Command.Get (getKeyFile')
-import Logs.Transfer
+import qualified Command.Move
-import Logs.Presence
 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 $ Command.Move.toPerform dest False k (Just f)
-			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
 		return (ok, if ok then Just (Remote.uuid dest) else Nothing)

debian/changelog

@@ -12,6 +12,9 @@ git-annex (5.20140128) UNRELEASED; urgency=medium
   * sync --content: Re-pull from remotes after downloading content,
     since that can take a while and other changes may be pushed in the
     meantime.
+  * sync --content: Reuse smart copy code from copy command, including
+    handling and repairing out of date location tracking info.
+    Closes: #737480
   * Added ways to configure rsync options to be used only when uploading
     or downloading from a remote. Useful to eg limit upload bandwidth.
   * Document in man page that sshcaching uses ssh ControlMaster.