copy/move --from-anywhere --to remote

Implementation was simple because it's equivilant to
--from=foo --to remote for each other remote, followed by
--to remote when there's a local copy.

(Or, in the edge case of --from-anywhere --to=here,
it's the same as --to=here.)

Note that, when the local repo does not have a copy,
fromToPerform gets it from a remote, sends it to the destination,
and drops the local copy. Another call to that for a second remote
will notice that the dest now has a copy, and simply drop from the
second remote, avoiding a second transfer.

Also note that, when numcopies doesn't allow dropping it from
everywhere, it will drop it from the cheapest remotes first
(maybe not ideal) up to more expensive remotes, and finally from the local
repo. So the local repo will generally end up holding a copy. Maybe not
ideal in all cases either, but it seems no worse to do that than to end up
with a copy undropped from a remote.

And I'm not entirely happy with the output, eg:

	copy bigfile (from r3...) ok
	copy bigfile ok

That makes sense if you think of the second line as being
the same as what is output by `git-annex copy bigfile --to bar`,
but it's less clear in this context. Maybe add "(from here...)"?
Also the --json output doesn't have a machine-readable field for
the "from" uuid, and maybe it should?

Sponsored-by: Dartmouth College's DANDI project
This commit is contained in:
Joey Hess 2023-11-30 16:32:32 -04:00
parent 1654572bc1
commit 1e31bf8122
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
7 changed files with 88 additions and 15 deletions

View file

@ -81,6 +81,7 @@ seek' o fto = startConcurrency (stages fto) $ do
FromOrToRemote (ToRemote _) -> Just True
ToHere -> Nothing
FromRemoteToRemote _ _ -> Nothing
FromAnywhereToRemote _ -> Nothing
, usesLocationLog = True
}
keyaction = startKey fto (removeWhen o)
@ -91,6 +92,7 @@ stages (FromOrToRemote (FromRemote _)) = transferStages
stages (FromOrToRemote (ToRemote _)) = commandStages
stages ToHere = transferStages
stages (FromRemoteToRemote _ _) = transferStages
stages (FromAnywhereToRemote _) = transferStages
start :: FromToHereOptions -> RemoveWhen -> SeekInput -> RawFilePath -> Key -> CommandStart
start fromto removewhen si f k = start' fromto removewhen afile si k ai
@ -118,6 +120,9 @@ start' fromto removewhen afile si key ai =
src' <- getParsed src
dest' <- getParsed dest
fromToStart removewhen afile key ai si src' dest'
FromAnywhereToRemote dest -> do
dest' <- getParsed dest
fromAnywhereToStart removewhen afile key ai si dest'
describeMoveAction :: RemoveWhen -> String
describeMoveAction RemoveNever = "copy"
@ -353,6 +358,30 @@ fromToStart removewhen afile key ai si src dest =
then not <$> expectedPresent dest key
else return True
fromAnywhereToStart :: RemoveWhen -> AssociatedFile -> Key -> ActionItem -> SeekInput -> Remote -> CommandStart
fromAnywhereToStart removewhen afile key ai si dest =
stopUnless somethingtodo $ do
u <- getUUID
if u == Remote.uuid dest
then toHereStart removewhen afile key ai si
else startingNoMessage (OnlyActionOn key ai) $ do
rs <- filter (/= dest)
<$> Remote.keyPossibilities (Remote.IncludeIgnored False) key
forM_ rs $ \r ->
includeCommandAction $
starting (describeMoveAction removewhen) ai si $
fromToPerform r dest removewhen key afile
whenM (inAnnex key) $
void $ includeCommandAction $
toStart removewhen afile key ai si dest
next $ return True
where
somethingtodo = do
fast <- Annex.getRead Annex.fast
if fast && removewhen == RemoveNever
then not <$> expectedPresent dest key
else return True
{- When there is a local copy, transfer it to the dest, and drop from the src.
-
- When the dest has a copy, drop it from the src.