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

make --json-progress update meter when getting from git remote with rsync

Browse source
This commit is contained in:
Joey Hess 2016-09-09 16:05:45 -04:00
parent a108235565
commit 312ef4dfae
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Remote/Git.hs
View file

@ -421,7 +421,7 @@ copyFromRemote :: Remote -> Key -> AssociatedFile -> FilePath -> MeterUpdate ->
copyFromRemote r key file dest p
| Git.repoIsHttp (repo r) = unVerified $
Annex.Content.downloadUrl key p (keyUrls r key) dest
| otherwise = concurrentMetered (Just p) key $
| otherwise = commandMetered (Just p) key $
copyFromRemote' r key file dest
copyFromRemote' :: Remote -> Key -> AssociatedFile -> FilePath -> MeterUpdate -> Annex (Bool, Verification)
@ -531,7 +531,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 meterupdate =
concurrentMetered (Just meterupdate) key $
commandMetered (Just meterupdate) key $
copyToRemote' r key file
copyToRemote' :: Remote -> Key -> AssociatedFile -> MeterUpdate -> Annex Bool