move: --safe/--unsafe and potential drop race fix

move: Added --safe option, which makes move honor numcopies settings.
Also --unsafe enables the default behavior, anticipating that the
default may one day change.

This commit was sponsored by Ethan Aubin.
This commit is contained in:
Joey Hess 2018-04-09 16:09:00 -04:00
parent ae530f043e
commit af8546990d
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
11 changed files with 187 additions and 74 deletions

View file

@ -55,7 +55,7 @@ start o file k = startKey o afile k (mkActionItem afile)
startKey :: MirrorOptions -> AssociatedFile -> Key -> ActionItem -> CommandStart
startKey o afile key ai = onlyActionOn key $ case fromToOptions o of
ToRemote r -> checkFailedTransferDirection ai Upload $ ifM (inAnnex key)
( Command.Move.toStart False afile key ai =<< getParsed r
( Command.Move.toStart Command.Move.RemoveNever afile key ai =<< getParsed r
, do
numcopies <- getnumcopies
Command.Drop.startRemote afile ai numcopies key =<< getParsed r