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

fix nested progress meters when using git-annex-shell fallback

Browse source 
Caused an ugly blank line when the first progress meter was not used,
but also it may have confused -J display.
This commit is contained in:
Joey Hess 2018-03-12 19:18:47 -04:00
parent 7bed3927ba
commit b96b845ffd
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Remote/Git.hs
View file

@ -470,17 +470,16 @@ copyFromRemote' forcersync r (State connpool _) key file dest meterupdate
file forwardRetry
(\p -> copier object dest (combineMeterUpdate p meterupdate) checksuccess)
| Git.repoIsSsh (repo r) = if forcersync
then unVerified fallback
then unVerified $ fallback meterupdate
else P2PHelper.retrieve
(Ssh.runProto r connpool False fallback)
(\p -> Ssh.runProto r connpool False (fallback p))
key file dest meterupdate
| otherwise = giveup "copying from non-ssh, non-http remote not supported"
where
fallback = metered (Just meterupdate) key (return Nothing) $ \p ->
feedprogressback $ \p' -> do
oh <- mkOutputHandlerQuiet
Ssh.rsyncHelper oh (Just (combineMeterUpdate p' p))
=<< Ssh.rsyncParamsRemote False r Download key dest file
fallback p = feedprogressback $ \p' -> do
oh <- mkOutputHandlerQuiet
Ssh.rsyncHelper oh (Just (combineMeterUpdate p' p))
=<< Ssh.rsyncParamsRemote False r Download key dest file
{- Feed local rsync's progress info back to the remote,
- by forking a feeder thread that runs
- git-annex-shell transferinfo at the same time
@ -575,7 +574,7 @@ copyToRemote r (State connpool duc) key file meterupdate
)
| Git.repoIsSsh (repo r) = commitOnCleanup r $
P2PHelper.store
(Ssh.runProto r connpool False copyremotefallback)
(\p -> Ssh.runProto r connpool False (copyremotefallback p))
key file meterupdate
| otherwise = giveup "copying to non-ssh repo not supported"
@ -602,15 +601,14 @@ copyToRemote r (State connpool duc) key file meterupdate
Annex.Content.getViaTmp verify key
(\dest -> copier object dest p' (liftIO checksuccessio))
)
copyremotefallback = Annex.Content.sendAnnex key noop $ \object ->
metered (Just meterupdate) key (return $ Just object) $ \p -> do
-- This is too broad really, but recvkey normally
-- verifies content anyway, so avoid complicating
-- it with a local sendAnnex check and rollback.
unlocked <- isDirect <||> versionSupportsUnlockedPointers
oh <- mkOutputHandlerQuiet
Ssh.rsyncHelper oh (Just p)
=<< Ssh.rsyncParamsRemote unlocked r Upload key object file
copyremotefallback p = Annex.Content.sendAnnex key noop $ \object -> do
-- This is too broad really, but recvkey normally
-- verifies content anyway, so avoid complicating
-- it with a local sendAnnex check and rollback.
unlocked <- isDirect <||> versionSupportsUnlockedPointers
oh <- mkOutputHandlerQuiet
Ssh.rsyncHelper oh (Just p)
=<< Ssh.rsyncParamsRemote unlocked r Upload key object file
fsckOnRemote :: Git.Repo -> [CommandParam] -> Annex (IO Bool)
fsckOnRemote r params