annex.autocommit can be configured via git-annex config

... to control the default behavior in all clones of a repository.

This includes a new Configurable data type, so the GitConfig type indicates
which values can be configured this way.

The implementation should be quite efficient; the config log is only read
once, and only when a Configurable value has not already been set by
git-config.

Indeed, it would be nice in the future to extend this, so that git-config
is itself only read on demand. Some commands may not need to look at the
git configuration at all.

This commit was sponsored by Trenton Cronholm on Patreon.
This commit is contained in:
Joey Hess 2017-02-03 13:40:14 -04:00
parent d6d23d8a15
commit ed56dba868
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
14 changed files with 93 additions and 26 deletions

View file

@ -1,4 +1,4 @@
{- git-annex config log
{- git-annex repository-global config log
-
- Copyright 2017 Joey Hess <id@joeyh.name>
-
@ -15,7 +15,6 @@ module Logs.Config (
) where
import Annex.Common
import qualified Annex
import Logs
import Logs.MapLog
import qualified Annex.Branch
@ -44,18 +43,13 @@ unsetGlobalConfig name = do
when (curr /= Nothing) $
setGlobalConfig' name "" -- set to empty string to unset
-- Reads the global config log every time.
getGlobalConfig :: ConfigName -> Annex (Maybe ConfigValue)
getGlobalConfig name = do
m <- maybe loadGlobalConfig return
=<< Annex.getState Annex.globalconfig
return (M.lookup name m)
getGlobalConfig name = M.lookup name <$> loadGlobalConfig
parseGlobalConfig :: String -> MapLog ConfigName ConfigValue
parseGlobalConfig = parseMapLog Just Just
loadGlobalConfig :: Annex (M.Map ConfigName ConfigValue)
loadGlobalConfig = do
m <- M.filter (not . null) . simpleMap . parseGlobalConfig
<$> Annex.Branch.get configLog
Annex.changeState $ \s -> s { Annex.globalconfig = Just m }
return m
loadGlobalConfig = M.filter (not . null) . simpleMap . parseGlobalConfig
<$> Annex.Branch.get configLog