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

plumb MeterUpdate into getKey

Browse source 
No behavior changes, but this shows everywhere that a progress meter
could be displayed when hashing a file to add to the annex.

Many of the places don't make sense to display a progress meter though,
eg when importing the copy of the file probably swamps the hashing of
the file.
This commit is contained in:
Joey Hess 2019-06-25 11:37:52 -04:00
parent 191bdaafc5
commit 8355dba5cc
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
18 changed files with 60 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Command/Add.hs
View file

@ -21,6 +21,7 @@ import Annex.Link
import Annex.Version
import Annex.Tmp
import Git.FilePath
import Utility.Metered
cmd :: Command
cmd = notBareRepo $
@ -141,7 +142,7 @@ perform file = withOtherTmp $ \tmpdir -> do
{ lockingFile = lockingfile
, hardlinkFileTmpDir = Just tmpdir
}
lockDown cfg file >>= ingestAdd >>= finish
lockDown cfg file >>= ingestAdd nullMeterUpdate >>= finish
where
finish (Just key) = next $ cleanup key True
finish Nothing = stop