mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

use built-in progress meters for git when in parallel mode

Browse source
This commit is contained in:
Joey Hess 2015-04-10 15:15:01 -04:00
parent 56eabe9b81
commit f8e700ed06
5 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Remote/Git.hs
View file

@ -52,6 +52,7 @@ import qualified Remote.GCrypt
import Annex.Path
import Creds
import Annex.CatFile
import Messages.Progress
import Control.Concurrent
import Control.Concurrent.MSampleVar
@ -354,9 +355,11 @@ dropKey r key
{- Tries to copy a key's content from a remote's annex to a file. -}
copyFromRemote :: Remote -> Key -> AssociatedFile -> FilePath -> MeterUpdate -> Annex Bool
copyFromRemote r key file dest _p = copyFromRemote' r key file dest
copyFromRemote' :: Remote -> Key -> AssociatedFile -> FilePath -> Annex Bool
copyFromRemote' r key file dest
copyFromRemote r key file dest p = metered (Just p) key $
copyFromRemote' r key file dest
copyFromRemote' :: Remote -> Key -> AssociatedFile -> FilePath -> MeterUpdate -> Annex Bool
copyFromRemote' r key file dest meterupdate
| not $ Git.repoIsUrl (repo r) = guardUsable (repo r) (return False) $ do
params <- Ssh.rsyncParams r Download
u <- getUUID
@ -434,7 +437,9 @@ copyFromRemote' r key file dest
send bytes
forever $
send =<< readSV v
let feeder = writeSV v . fromBytesProcessed
let feeder = \n -> do
meterupdate n
writeSV v (fromBytesProcessed n)
let cleanup = do
void $ tryIO $ killThread tid
tryNonAsync $
@ -451,7 +456,7 @@ copyFromRemoteCheap r key file
liftIO $ catchBoolIO $ createSymbolicLink loc file >> return True
| Git.repoIsSsh (repo r) =
ifM (Annex.Content.preseedTmp key file)
( copyFromRemote' r key Nothing file
( metered Nothing key $ copyFromRemote' r key Nothing file
, return False
)
| otherwise = return False