diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-05-31 16:57:27 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-05-31 17:00:18 -0400 |
| commit | 8ba5e7165763682c9154a7cfc3e8b070d0685a6b (patch) | |
| tree | c6a0f3a606e9894408722746ce093a3081201d69 /Command/Copy.hs | |
| parent | 75ae06595a6971eb21630928bcdd3f33c06b3ea0 (diff) | |
move --to=here
* move --to=here moves from all reachable remotes to the local repository.
The output of move --from remote is changed slightly, when the remote and
local both have the content. It used to say:
move foo ok
Now:
move foo (from theremote...) ok
That was done so that, when move --to=here is used and the content is
locally present and also in several remotes, it's clear which remotes the
content gets dropped from.
Note that move --to=here will report an error if a non-reachable remote
contains the file, even if the local repository also contains the file. I
think that's reasonable; the user may be intending to move all other copies
of the file from remotes.
OTOH, if a copy of the file is believed to be present in some repository
that is not a configured remote, move --to=here does not report an error.
So a little bit inconsistent, but erroring in this case feels wrong.
copy --to=here came along for free, but it's basically the same behavior as
git-annex get, and probably with not as good messages in edge cases
(especially on failure), so I've not documented it.
This commit was sponsored by Anthony DeRobertis on Patreon.
Diffstat (limited to 'Command/Copy.hs')
| -rw-r--r-- | Command/Copy.hs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Command/Copy.hs b/Command/Copy.hs index 1f35d9ce8..667f940f0 100644 --- a/Command/Copy.hs +++ b/Command/Copy.hs @@ -52,7 +52,10 @@ start o file key = stopUnless shouldCopy $ | autoMode o = want <||> numCopiesCheck file key (<) | otherwise = return True want = case Command.Move.fromToOptions (moveOptions o) of - Right (ToRemote dest) -> (Remote.uuid <$> getParsed dest) >>= - wantSend False (Just key) (AssociatedFile (Just file)) - Right (FromRemote _) -> - wantGet False (Just key) (AssociatedFile (Just file)) + Right (ToRemote dest) -> + (Remote.uuid <$> getParsed dest) >>= checkwantsend + Right (FromRemote _) -> checkwantget + Left Command.Move.ToHere -> checkwantget + + checkwantsend = wantSend False (Just key) (AssociatedFile (Just file)) + checkwantget = wantGet False (Just key) (AssociatedFile (Just file)) |