finish v6 support for assistant

Seems to basically work now!

1 files changed, 7 insertions, 6 deletions

diff --git a/Assistant/Types/Changes.hs b/Assistant/Types/Changes.hs
index 1d8b51775..8c2d02cab 100644
--- a/Assistant/Types/Changes.hs
+++ b/Assistant/Types/Changes.hs
@@ -10,6 +10,7 @@ module Assistant.Types.Changes where
 import Types.KeySource
 import Types.Key
 import Utility.TList
+import Annex.Ingest
 
 import Control.Concurrent.STM
 import Data.Time.Clock
@@ -38,7 +39,7 @@ data Change
 		}
 	| InProcessAddChange
 		{ changeTime ::UTCTime
-		, keySource :: KeySource
+		, lockedDown :: LockedDown
 		}
 	deriving (Show)
 
@@ -53,7 +54,7 @@ changeInfoKey _ = Nothing
 changeFile :: Change -> FilePath
 changeFile (Change _ f _) = f
 changeFile (PendingAddChange _ f) = f
-changeFile (InProcessAddChange _ ks) = keyFilename ks
+changeFile (InProcessAddChange _ ld) = keyFilename $ keySource ld
 
 isPendingAddChange :: Change -> Bool
 isPendingAddChange (PendingAddChange {}) = True
@@ -64,14 +65,14 @@ isInProcessAddChange (InProcessAddChange {}) = True
 isInProcessAddChange _ = False
 
 retryChange :: Change -> Change
-retryChange (InProcessAddChange time ks) =
-	PendingAddChange time (keyFilename ks)
+retryChange c@(InProcessAddChange time _) =
+	PendingAddChange time $ changeFile c
 retryChange c = c
 
 finishedChange :: Change -> Key -> Change
-finishedChange c@(InProcessAddChange { keySource = ks }) k = Change
+finishedChange c@(InProcessAddChange {}) k = Change
 	{ changeTime = changeTime c
-	, _changeFile = keyFilename ks
+	, _changeFile = changeFile c
 	, changeInfo = AddKeyChange k
 	}
 finishedChange c _ = c