diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-11-04 13:45:34 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-11-04 13:45:34 -0400 |
| commit | 1933f8a5599f33b95811710ad10e1ed17703699d (patch) | |
| tree | acf454abe167051a7ff77a752deb6c5b9f45a758 /Remote | |
| parent | c3a372f8f500f6b88d467af42df6332836d8dd31 (diff) | |
concurrent-output, first pass
Output without -Jn should be unchanged from before. With -Jn,
concurrent-output is used for messages, but regions are not used yet, so
it's a mess.
Diffstat (limited to 'Remote')
| -rw-r--r-- | Remote/Git.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs index 33eadd3d0..c8ef1aee0 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -421,7 +421,7 @@ lockKey r key callback {- Tries to copy a key's content from a remote's annex to a file. -} copyFromRemote :: Remote -> Key -> AssociatedFile -> FilePath -> MeterUpdate -> Annex (Bool, Verification) -copyFromRemote r key file dest p = parallelMetered (Just p) key file $ +copyFromRemote r key file dest p = concurrentMetered (Just p) key file $ copyFromRemote' r key file dest copyFromRemote' :: Remote -> Key -> AssociatedFile -> FilePath -> MeterUpdate -> Annex (Bool, Verification) @@ -522,7 +522,7 @@ copyFromRemoteCheap r key af file ) | Git.repoIsSsh (repo r) = ifM (Annex.Content.preseedTmp key file) - ( fst <$> parallelMetered Nothing key af + ( fst <$> concurrentMetered Nothing key af (copyFromRemote' r key af file) , return False ) @@ -533,7 +533,7 @@ copyFromRemoteCheap _ _ _ _ = return False {- Tries to copy a key's content to a remote's annex. -} copyToRemote :: Remote -> Key -> AssociatedFile -> MeterUpdate -> Annex Bool -copyToRemote r key file p = parallelMetered (Just p) key file $ copyToRemote' r key file +copyToRemote r key file p = concurrentMetered (Just p) key file $ copyToRemote' r key file copyToRemote' :: Remote -> Key -> AssociatedFile -> MeterUpdate -> Annex Bool copyToRemote' r key file p |