plumb MeterUpdate into getKey
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:
parent
191bdaafc5
commit
8355dba5cc
18 changed files with 60 additions and 44 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue