diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-08-17 14:04:29 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-08-17 14:04:29 -0400 |
| commit | 4bdd8083ad7d77de41a2389aed87805eb354d358 (patch) | |
| tree | 1a2f8e485859013c564773ff458fa223476bcc9b /Types | |
| parent | ecab35e095a97083285911809cc81d44a4384196 (diff) | |
use DynamicConfig to handle cost-command
This commit was sponsored by Jake Vosloo on Patreon.
Diffstat (limited to 'Types')
| -rw-r--r-- | Types/GitConfig.hs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Types/GitConfig.hs b/Types/GitConfig.hs index 6eea51998..d523c745a 100644 --- a/Types/GitConfig.hs +++ b/Types/GitConfig.hs @@ -192,8 +192,7 @@ mergeGitConfig gitconfig repoglobals = gitconfig - key such as <remote>.annex-foo, or if that is not set, a default from - annex.foo -} data RemoteGitConfig = RemoteGitConfig - { remoteAnnexCost :: Maybe Cost - , remoteAnnexCostCommand :: Maybe String + { remoteAnnexCost :: DynamicConfig (Maybe Cost) , remoteAnnexIgnore :: DynamicConfig Bool , remoteAnnexSync :: DynamicConfig Bool , remoteAnnexPull :: Bool @@ -231,6 +230,9 @@ data RemoteGitConfig = RemoteGitConfig extractRemoteGitConfig :: Git.Repo -> String -> STM RemoteGitConfig extractRemoteGitConfig r remotename = do + annexcost <- mkDynamicConfig readCommandRunner + (notempty $ getmaybe "cost-command") + (getmayberead "cost") annexignore <- mkDynamicConfig unsuccessfullCommandRunner (notempty $ getmaybe "ignore-command") (getbool "ignore" False) @@ -238,8 +240,7 @@ extractRemoteGitConfig r remotename = do (notempty $ getmaybe "sync-command") (getbool "sync" True) return $ RemoteGitConfig - { remoteAnnexCost = getmayberead "cost" - , remoteAnnexCostCommand = notempty $ getmaybe "cost-command" + { remoteAnnexCost = annexcost , remoteAnnexIgnore = annexignore , remoteAnnexSync = annexsync , remoteAnnexPull = getbool "pull" True |