add VerifiedCopy data type
There should be no behavior changes in this commit, it just adds a more expressive data type and adjusts code that had been passing around a [UUID] or sometimes a Maybe Remote to instead use [VerifiedCopy]. Although, since some functions were taking two different [UUID] lists, there's some potential for me to have gotten it horribly wrong.
This commit is contained in:
parent
b1abe59193
commit
90f7c4b6a2
16 changed files with 107 additions and 60 deletions
|
@ -30,6 +30,7 @@ import Annex.Content
|
|||
import Annex.Wanted
|
||||
import Annex.Path
|
||||
import Utility.Batch
|
||||
import Types.NumCopies
|
||||
|
||||
import qualified Data.Map as M
|
||||
import qualified Control.Exception as E
|
||||
|
@ -160,7 +161,7 @@ genTransfer t info = case transferRemote info of
|
|||
("object uploaded to " ++ show remote)
|
||||
True (transferKey t)
|
||||
(associatedFile info)
|
||||
(Just remote)
|
||||
[VerifiedCopy (Remote.uuid remote)]
|
||||
void recordCommit
|
||||
, whenM (liftAnnex $ isNothing <$> checkTransfer t) $
|
||||
void $ removeTransfer t
|
||||
|
@ -225,7 +226,7 @@ finishedTransfer t (Just info)
|
|||
where
|
||||
dodrops fromhere = handleDrops
|
||||
("drop wanted after " ++ describeTransfer t info)
|
||||
fromhere (transferKey t) (associatedFile info) Nothing
|
||||
fromhere (transferKey t) (associatedFile info) []
|
||||
finishedTransfer _ _ = noop
|
||||
|
||||
{- Pause a running transfer. -}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue