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

factor out IncrementalHasher from IncrementalVerifier

Browse source
This commit is contained in:
Joey Hess 2021-11-09 12:29:09 -04:00
parent 9d3ce224e3
commit 8034f2e9bb
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
9 changed files with 68 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Annex/CopyFile.hs
View file

@ -86,7 +86,7 @@ fileCopier _ src dest meterupdate iv = docopy
fileCopier copycowtried src dest meterupdate iv =
ifM (liftIO $ tryCopyCoW copycowtried src dest meterupdate)
( do
liftIO $ maybe noop unableIncremental iv
liftIO $ maybe noop unableIncrementalVerifier iv
return CopiedCoW
, docopy
)
@ -119,7 +119,7 @@ fileCopier copycowtried src dest meterupdate iv =
else do
let sofar' = addBytesProcessed sofar (S.length s)
S.hPut hdest s
maybe noop (flip updateIncremental s) iv
maybe noop (flip updateIncrementalVerifier s) iv
meterupdate sofar'
docopy' hdest hsrc sofar'
@ -134,7 +134,7 @@ fileCopier copycowtried src dest meterupdate iv =
s' <- getnoshort (S.length s) hsrc
if s == s'
then do
maybe noop (flip updateIncremental s) iv
maybe noop (flip updateIncrementalVerifier s) iv
let sofar' = addBytesProcessed sofar (S.length s)
meterupdate sofar'
compareexisting hdest hsrc sofar'