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

Fix duplicate progress meter display when downloading from a git remote over http with -J.

Browse source
This commit is contained in:
Joey Hess 2016-04-19 13:10:56 -04:00
parent e3fb94b006
commit 850d0da699
Failed to extract signature
3 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Remote/Git.hs
View file

@ -418,8 +418,11 @@ lockKey r key callback
{- Tries to copy a key's content from a remote's annex to a file. -} {- 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 :: Remote -> Key -> AssociatedFile -> FilePath -> MeterUpdate -> Annex (Bool, Verification)
copyFromRemote r key file dest p = concurrentMetered (Just p) key $ copyFromRemote r key file dest p
copyFromRemote' r key file dest | Git.repoIsHttp (repo r) = unVerified $
Annex.Content.downloadUrl key p (keyUrls r key) dest
| otherwise = concurrentMetered (Just p) key $
copyFromRemote' r key file dest
copyFromRemote' :: Remote -> Key -> AssociatedFile -> FilePath -> MeterUpdate -> Annex (Bool, Verification) copyFromRemote' :: Remote -> Key -> AssociatedFile -> FilePath -> MeterUpdate -> Annex (Bool, Verification)
copyFromRemote' r key file dest meterupdate copyFromRemote' r key file dest meterupdate
@ -441,8 +444,6 @@ copyFromRemote' r key file dest meterupdate
| Git.repoIsSsh (repo r) = unVerified $ feedprogressback $ \p -> do | Git.repoIsSsh (repo r) = unVerified $ feedprogressback $ \p -> do
Ssh.rsyncHelper (Just (combineMeterUpdate meterupdate p)) Ssh.rsyncHelper (Just (combineMeterUpdate meterupdate p))
=<< Ssh.rsyncParamsRemote False r Download key dest file =<< Ssh.rsyncParamsRemote False r Download key dest file
| Git.repoIsHttp (repo r) = unVerified $
Annex.Content.downloadUrl key meterupdate (keyUrls r key) dest
| otherwise = error "copying from non-ssh, non-http remote not supported" | otherwise = error "copying from non-ssh, non-http remote not supported"
where where
{- Feed local rsync's progress info back to the remote, {- Feed local rsync's progress info back to the remote,
@ -519,8 +520,7 @@ copyFromRemoteCheap r key af file
) )
| Git.repoIsSsh (repo r) = | Git.repoIsSsh (repo r) =
ifM (Annex.Content.preseedTmp key file) ifM (Annex.Content.preseedTmp key file)
( fst <$> concurrentMetered Nothing key ( fst <$> copyFromRemote r key af file nullMeterUpdate
(copyFromRemote' r key af file)
, return False , return False
) )
| otherwise = return False | otherwise = return False

7
debian/changelog vendored
View file

@ -1,3 +1,10 @@
git-annex (6.20160419) UNRELEASED; urgency=medium
* Fix duplicate progress meter display when downloading from a git remote
over http with -J.
-- Joey Hess <id@joeyh.name> Tue, 19 Apr 2016 12:57:15 -0400
git-annex (6.20160418) unstable; urgency=medium git-annex (6.20160418) unstable; urgency=medium
* smudge: Print a warning when annex.thin is set, as git's smudge * smudge: Print a warning when annex.thin is set, as git's smudge

2
doc/bugs/duplicate_progress_reports_in_parallel___39__get__39__.mdwn
View file

@ -20,3 +20,5 @@ get docs/freesurfer.intro.mmclass.ppt (from origin...)
"""]] """]]
[[!meta author=yoh]] [[!meta author=yoh]]
> [[fixed|done]] --[[Joey]]