From 7964491f1b5f7a4e2000fd362dea00068f843454 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 28 Jan 2013 00:33:19 +1100 Subject: add another setting to GitConfig --- Types/GitConfig.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Types/GitConfig.hs') diff --git a/Types/GitConfig.hs b/Types/GitConfig.hs index 30214bc29..86bfd39b6 100644 --- a/Types/GitConfig.hs +++ b/Types/GitConfig.hs @@ -34,6 +34,7 @@ data GitConfig = GitConfig , annexHttpHeaders :: [String] , annexHttpHeadersCommand :: Maybe String , annexAutoCommit :: Bool + , annexWebOptions :: [String] } extractGitConfig :: Git.Repo -> GitConfig @@ -43,7 +44,7 @@ extractGitConfig r = GitConfig , annexDiskReserve = fromMaybe onemegabyte $ readSize dataUnits =<< getmaybe "diskreserve" , annexDirect = getbool "direct" False - , annexBackends = fromMaybe [] $ words <$> getmaybe "backends" + , annexBackends = getwords "backends" , annexQueueSize = getmayberead "queuesize" , annexBloomCapacity = getmayberead "bloomcapacity" , annexBloomAccuracy = getmayberead "bloomaccuracy" @@ -53,6 +54,7 @@ extractGitConfig r = GitConfig , annexHttpHeaders = getlist "http-headers" , annexHttpHeadersCommand = getmaybe "http-headers-command" , annexAutoCommit = getbool "autocommit" True + , annexWebOptions = getwords "web-options" } where get k def = fromMaybe def $ getmayberead k @@ -61,6 +63,7 @@ extractGitConfig r = GitConfig getmayberead k = readish =<< getmaybe k getmaybe k = Git.Config.getMaybe (key k) r getlist k = Git.Config.getList (key k) r + getwords k = fromMaybe [] $ words <$> getmaybe k key k = "annex." ++ k -- cgit v1.2.3