Merge branch 'later'

This commit is contained in:
Joey Hess 2018-06-25 21:59:20 -04:00
commit dc6cb6aa5f
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
7 changed files with 93 additions and 21 deletions

View file

@ -15,6 +15,7 @@ import qualified Git
import qualified Git.Construct
import Annex.Content
import Config.Cost
import Config
import Logs.Web
import Annex.UUID
import Messages.Progress
@ -40,10 +41,11 @@ list _autoinit = do
return [r]
gen :: Git.Repo -> UUID -> RemoteConfig -> RemoteGitConfig -> Annex (Maybe Remote)
gen r _ c gc =
gen r _ c gc = do
cst <- remoteCost gc expensiveRemoteCost
return $ Just Remote
{ uuid = webUUID
, cost = expensiveRemoteCost
, cost = cst
, name = Git.repoDescribe r
, storeKey = uploadKey
, retrieveKeyFile = downloadKey