diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-08-03 12:37:12 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-08-03 12:37:12 -0400 |
| commit | 508517de485e77196a8d8e33558f4185c50dea96 (patch) | |
| tree | 319fc6e63da144e40dd124a07f4bb6c0ad25c5ee /Command/Get.hs | |
| parent | 019733f00d01301d71acc46245d2dc130934d951 (diff) | |
get, move, copy, mirror: Added --failed switch which retries failed copies/moves
Note that get --from foo --failed will get things that a previous get --from bar
tried and failed to get, etc. I considered making --failed only retry
transfers from the same remote, but it was easier, and seems more useful,
to not have the same remote requirement.
Noisy due to some refactoring into Types/
Diffstat (limited to 'Command/Get.hs')
| -rw-r--r-- | Command/Get.hs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Command/Get.hs b/Command/Get.hs index 3f461fa04..bd4891b92 100644 --- a/Command/Get.hs +++ b/Command/Get.hs @@ -14,6 +14,7 @@ import Annex.Transfer import Annex.NumCopies import Annex.Wanted import qualified Command.Move +import Types.ActionItem cmd :: Command cmd = withGlobalOptions (jobsOption : jsonOption : annexedMatchingOptions) $ @@ -34,7 +35,7 @@ optParser desc = GetOptions <$> cmdParams desc <*> optional parseFromOption <*> parseAutoOption - <*> optional (parseKeyOptions True) + <*> optional (parseIncompleteOption <|> parseKeyOptions <|> parseFailedTransfersOption) <*> parseBatchOption seek :: GetOptions -> CommandSeek @@ -57,7 +58,8 @@ start o from file key = start' expensivecheck from key afile (mkActionItem afile | otherwise = return True startKeys :: Maybe Remote -> Key -> ActionItem -> CommandStart -startKeys from key = start' (return True) from key Nothing +startKeys from key ai = checkFailedTransferDirection ai Download $ + start' (return True) from key Nothing ai start' :: Annex Bool -> Maybe Remote -> Key -> AssociatedFile -> ActionItem -> CommandStart start' expensivecheck from key afile ai = stopUnless (not <$> inAnnex key) $ |