remove direct mode support from Annex.Content

No longer used. The only possible user of it would be code in
Upgrade.V5, so I verified that the parts of Annex.Content it used were
not used to manipulate direct mode files.
This commit is contained in:
Joey Hess 2019-08-27 12:59:57 -04:00
parent 16f646c9a6
commit da6f4d8887
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
8 changed files with 77 additions and 198 deletions

View file

@ -90,12 +90,7 @@ fixupReq req@(Req {}) =
v <- getAnnexLinkTarget' (getfile r) False
case parseLinkTargetOrPointer =<< v of
Nothing -> return r
Just k -> setfile r <$>
withObjectLoc k
-- indirect mode
return
-- direct mode
(return . Prelude.head)
Just k -> withObjectLoc k (pure . setfile r)
_ -> return r
externalDiffer :: String -> [String] -> Differ

View file

@ -527,7 +527,7 @@ cachedPresentData = do
case presentData s of
Just v -> return v
Nothing -> do
v <- foldKeys <$> lift (getKeysPresent InRepository)
v <- foldKeys <$> lift (listKeys InAnnex)
put s { presentData = Just v }
return v

View file

@ -137,7 +137,7 @@ send ups fs = do
mk <- lookupFile f
case mk of
Nothing -> noop
Just k -> withObjectLoc k (addlist f) (const noop)
Just k -> withObjectLoc k (addlist f)
liftIO $ hClose h
serverkey <- uftpKey

View file

@ -59,7 +59,7 @@ finish :: Annex ()
finish = do
annexdir <- fromRepo gitAnnexDir
annexobjectdir <- fromRepo gitAnnexObjectDir
leftovers <- removeUnannexed =<< getKeysPresent InAnnex
leftovers <- removeUnannexed =<< listKeys InAnnex
prepareRemoveAnnexDir annexdir
if null leftovers
then liftIO $ removeDirectoryRecursive annexdir

View file

@ -84,9 +84,7 @@ checkUnused refspec = chain 0
return []
findunused False = do
showAction "checking for unused data"
-- InAnnex, not InRepository because if a direct mode
-- file exists, it is obviously not unused.
excludeReferenced refspec =<< getKeysPresent InAnnex
excludeReferenced refspec =<< listKeys InAnnex
chain _ [] = next $ return True
chain v (a:as) = do
v' <- a v