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

use new getConfig

Browse source
This commit is contained in:
Joey Hess 2012-03-22 00:23:15 -04:00
parent 4eb5112681
commit f1398b5583
8 changed files with 16 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Config.hs
View file

@ -32,9 +32,8 @@ getConfig key def = fromRepo $ Git.Config.get key def
{- Looks up a per-remote config setting in git config.
- Failing that, tries looking for a global config option. -}
getRemoteConfig :: Git.Repo -> ConfigKey -> String -> Annex String
getRemoteConfig r key def = do
def' <- getConfig key def
fromRepo $ Git.Config.get (remoteConfig r key) def'
getRemoteConfig r key def =
getConfig (remoteConfig r key) =<< getConfig key def
{- A per-remote config setting in git config. -}
remoteConfig :: Git.Repo -> ConfigKey -> String
@ -85,9 +84,8 @@ getNumCopies v = perhaps (use v) =<< Annex.getState Annex.forcenumcopies
where
use (Just n) = return n
use Nothing = perhaps (return 1) =<<
readish <$> fromRepo (Git.Config.get config "1")
readish <$> getConfig "annex.numcopies" "1"
perhaps fallback = maybe fallback (return . id)
config = "annex.numcopies"
{- Gets the trust level set for a remote in git config. -}
getTrustLevel :: Git.Repo -> Annex (Maybe String)