summaryrefslogtreecommitdiff
path: root/Remote
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 /Remote
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 'Remote')
-rw-r--r--Remote/External.hs2
-rw-r--r--Remote/External/Types.hs2
-rw-r--r--Remote/GCrypt.hs2
-rw-r--r--Remote/Helper/Ssh.hs2
-rw-r--r--Remote/Rsync.hs2
5 files changed, 5 insertions, 5 deletions
diff --git a/Remote/External.hs b/Remote/External.hs
index 9caf48aae..f88b069be 100644
--- a/Remote/External.hs
+++ b/Remote/External.hs
@@ -22,7 +22,7 @@ import Remote.Helper.ReadOnly
import Remote.Helper.Messages
import Utility.Metered
import Messages.Progress
-import Logs.Transfer
+import Types.Transfer
import Logs.PreferredContent.Raw
import Logs.RemoteState
import Logs.Web
diff --git a/Remote/External/Types.hs b/Remote/External/Types.hs
index 66a285535..87c2dc056 100644
--- a/Remote/External/Types.hs
+++ b/Remote/External/Types.hs
@@ -34,7 +34,7 @@ module Remote.External.Types (
import Annex.Common
import Types.StandardGroups (PreferredContentExpression)
import Utility.Metered (BytesProcessed(..))
-import Logs.Transfer (Direction(..))
+import Types.Transfer (Direction(..))
import Config.Cost (Cost)
import Types.Remote (RemoteConfig)
import Types.Availability (Availability(..))
diff --git a/Remote/GCrypt.hs b/Remote/GCrypt.hs
index d34c733c5..a0c8ecaf7 100644
--- a/Remote/GCrypt.hs
+++ b/Remote/GCrypt.hs
@@ -25,6 +25,7 @@ import Types.Remote
import Types.GitConfig
import Types.Crypto
import Types.Creds
+import Types.Transfer
import qualified Git
import qualified Git.Command
import qualified Git.Config
@@ -47,7 +48,6 @@ import qualified Remote.Directory
import Utility.Rsync
import Utility.Tmp
import Logs.Remote
-import Logs.Transfer
import Utility.Gpg
remote :: RemoteType
diff --git a/Remote/Helper/Ssh.hs b/Remote/Helper/Ssh.hs
index cef30082b..4ec772296 100644
--- a/Remote/Helper/Ssh.hs
+++ b/Remote/Helper/Ssh.hs
@@ -20,7 +20,7 @@ import Messages.Progress
import Utility.Metered
import Utility.Rsync
import Types.Remote
-import Logs.Transfer
+import Types.Transfer
import Config
{- Generates parameters to ssh to a repository's host and run a command.
diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs
index 8acf91214..4695ac7a9 100644
--- a/Remote/Rsync.hs
+++ b/Remote/Rsync.hs
@@ -34,7 +34,7 @@ import Utility.Rsync
import Utility.CopyFile
import Messages.Progress
import Utility.Metered
-import Logs.Transfer
+import Types.Transfer
import Types.Creds
import Annex.DirHashes
import Utility.Tmp