summaryrefslogtreecommitdiff
path: root/Annex
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-04-10 17:08:07 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-04-10 17:08:07 -0400
commitc7a5cc5cc31377e5fed1fc59bfdeb503784d060d (patch)
tree2acb62d5fef9a1b2a02cbc43fa8c81b7108c91f1 /Annex
parentb4dd6c2250efd959c2b0c0d032d9508ef55ea79a (diff)
get, move, copy, mirror: Concurrent downloads and uploads are now supported!
This works, and seems fairly robust. Clean get of 20 files at -J3. At -J10, there are some messages about ssh multiplexing, probably due to a race spinning up the ssh connection cacher. But, it manages to get all the files ok regardless. The progress bars are a scrambled mess though, due to bugs in ascii-progress, which I've already filed. Particularly this one: https://github.com/yamadapc/haskell-ascii-progress/issues/8
Diffstat (limited to 'Annex')
-rw-r--r--Annex/Drop.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Annex/Drop.hs b/Annex/Drop.hs
index 6f3b95615..0ea815db2 100644
--- a/Annex/Drop.hs
+++ b/Annex/Drop.hs
@@ -42,7 +42,7 @@ type Reason = String
- The runner is used to run commands, and so can be either callCommand
- or commandAction.
-}
-handleDropsFrom :: [UUID] -> [Remote] -> Reason -> Bool -> Key -> AssociatedFile -> Maybe Remote -> CommandActionRunner -> Annex ()
+handleDropsFrom :: [UUID] -> [Remote] -> Reason -> Bool -> Key -> AssociatedFile -> Maybe Remote -> (CommandStart -> CommandCleanup) -> Annex ()
handleDropsFrom locs rs reason fromhere key afile knownpresentremote runner = do
fs <- ifM isDirect
( do