aboutsummaryrefslogtreecommitdiff
path: root/Annex
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-08-03 12:37:12 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-08-03 12:37:12 -0400
commit508517de485e77196a8d8e33558f4185c50dea96 (patch)
tree319fc6e63da144e40dd124a07f4bb6c0ad25c5ee /Annex
parent019733f00d01301d71acc46245d2dc130934d951 (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 'Annex')
-rw-r--r--Annex/Content.hs1
-rw-r--r--Annex/Notification.hs2
-rw-r--r--Annex/Transfer.hs1
3 files changed, 3 insertions, 1 deletions
diff --git a/Annex/Content.hs b/Annex/Content.hs
index 36d9db7e9..b975c8e90 100644
--- a/Annex/Content.hs
+++ b/Annex/Content.hs
@@ -54,6 +54,7 @@ import qualified Data.Set as S
import Annex.Common
import Logs.Location
+import Types.Transfer
import Logs.Transfer
import qualified Git
import qualified Annex
diff --git a/Annex/Notification.hs b/Annex/Notification.hs
index 691b61dd5..4f492878b 100644
--- a/Annex/Notification.hs
+++ b/Annex/Notification.hs
@@ -10,7 +10,7 @@
module Annex.Notification (NotifyWitness, notifyTransfer, notifyDrop) where
import Annex.Common
-import Logs.Transfer
+import Types.Transfer
#ifdef WITH_DBUS_NOTIFICATIONS
import qualified Annex
import Types.DesktopNotify
diff --git a/Annex/Transfer.hs b/Annex/Transfer.hs
index 78ef0e502..55a8d39f7 100644
--- a/Annex/Transfer.hs
+++ b/Annex/Transfer.hs
@@ -20,6 +20,7 @@ module Annex.Transfer (
import Annex.Common
import Logs.Transfer as X
+import Types.Transfer as X
import Annex.Notification as X
import Annex.Perms
import Utility.Metered