diff options
| -rw-r--r-- | Remote/Git.hs | 12 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | doc/bugs/duplicate_progress_reports_in_parallel___39__get__39__.mdwn | 2 |
3 files changed, 15 insertions, 6 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs index 284d6a49c..a0992957c 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -418,8 +418,11 @@ 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 = concurrentMetered (Just p) key $ - copyFromRemote' r key file dest +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 $ + copyFromRemote' r key file dest copyFromRemote' :: Remote -> Key -> AssociatedFile -> FilePath -> MeterUpdate -> Annex (Bool, Verification) copyFromRemote' r key file dest meterupdate @@ -441,8 +444,6 @@ copyFromRemote' r key file dest meterupdate | Git.repoIsSsh (repo r) = unVerified $ feedprogressback $ \p -> do Ssh.rsyncHelper (Just (combineMeterUpdate meterupdate p)) =<< 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" where {- Feed local rsync's progress info back to the remote, @@ -519,8 +520,7 @@ copyFromRemoteCheap r key af file ) | Git.repoIsSsh (repo r) = ifM (Annex.Content.preseedTmp key file) - ( fst <$> concurrentMetered Nothing key - (copyFromRemote' r key af file) + ( fst <$> copyFromRemote r key af file nullMeterUpdate , return False ) | otherwise = return False diff --git a/debian/changelog b/debian/changelog index 56702a5c1..d18b5332c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 * smudge: Print a warning when annex.thin is set, as git's smudge diff --git a/doc/bugs/duplicate_progress_reports_in_parallel___39__get__39__.mdwn b/doc/bugs/duplicate_progress_reports_in_parallel___39__get__39__.mdwn index 398eb04ca..21e1d4446 100644 --- a/doc/bugs/duplicate_progress_reports_in_parallel___39__get__39__.mdwn +++ b/doc/bugs/duplicate_progress_reports_in_parallel___39__get__39__.mdwn @@ -20,3 +20,5 @@ get docs/freesurfer.intro.mmclass.ppt (from origin...) """]] [[!meta author=yoh]] + +> [[fixed|done]] --[[Joey]] |