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

remoteConfig rework

Browse source 
remoteAnnexConfig will avoid bugs like
a3a674d15b

Use now more generic remoteConfig in a couple places that built
non-annex config settings manually before.
This commit is contained in:
Joey Hess 2020-02-19 13:45:11 -04:00
parent a3a674d15b
commit 69f2d1dd43
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
17 changed files with 30 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Remote/Git.hs
View file

@ -98,10 +98,10 @@ list autoinit = do
rs <- mapM (tweakurl c) =<< Annex.getGitRemotes
mapM (configRead autoinit) rs
where
annexurl n = Git.ConfigKey ("remote." <> encodeBS' n <> ".annexurl")
annexurl r = remoteConfig r "annexurl"
tweakurl c r = do
let n = fromJust $ Git.remoteName r
case M.lookup (annexurl n) c of
case M.lookup (annexurl r) c of
Nothing -> return r
Just url -> inRepo $ \g ->
Git.Construct.remoteNamed n $
@ -256,7 +256,7 @@ tryGitConfigRead autoinit r
| otherwise -> configlist_failed
Left _ -> configlist_failed
| Git.repoIsHttp r = storeUpdatedRemote geturlconfig
| Git.GCrypt.isEncrypted r = handlegcrypt =<< getConfigMaybe (remoteConfig r "uuid")
| Git.GCrypt.isEncrypted r = handlegcrypt =<< getConfigMaybe (remoteAnnexConfig r "uuid")
| Git.repoIsUrl r = return r
| otherwise = storeUpdatedRemote $ liftIO $
readlocalannexconfig `catchNonAsync` (const $ return r)