2017-02-03 17:40:14 +00:00
|
|
|
{- git-annex configuration
|
|
|
|
-
|
git-annex config annex.largefiles
annex.largefiles can be configured by git-annex config, to more easily set
a default that will also be used by clones, without needing to shoehorn the
expression into the gitattributes file. The git config and gitattributes
override that.
Whenever something is added to git-annex config, we have to consider what
happens if a user puts a purposfully bad value in there. Or, if a new
git-annex adds some new value that an old git-annex can't parse.
In this case, a global annex.largefiles that can't be parsed currently
makes an error be thrown. That might not be ideal, but the gitattribute
behaves the same, and is almost equally repo-global.
Performance notes:
git-annex add and addurl construct a matcher once
and uses it for every file, so the added time penalty for reading the global
config log is minor. If the gitattributes annex.largefiles were deprecated,
git-annex add would get around 2% faster (excluding hashing), because
looking that up for each file is not fast. So this new way of setting
it is progress toward speeding up add.
git-annex smudge does need to load the log every time. As well as checking
the git attribute. Not ideal. Setting annex.gitaddtoannex=false avoids
both overheads.
2019-12-20 16:12:31 +00:00
|
|
|
- Copyright 2017-2019 Joey Hess <id@joeyh.name>
|
2017-02-03 17:40:14 +00:00
|
|
|
-
|
2019-03-13 19:48:14 +00:00
|
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
2017-02-03 17:40:14 +00:00
|
|
|
-}
|
|
|
|
|
|
|
|
module Config.GitConfig where
|
|
|
|
|
|
|
|
import Annex.Common
|
|
|
|
import qualified Annex
|
|
|
|
import Types.GitConfig
|
|
|
|
import Git.Types
|
|
|
|
import Logs.Config
|
|
|
|
|
|
|
|
{- Gets a specific setting from GitConfig. If necessary, loads the
|
|
|
|
- repository-global defaults when the GitConfig does not yet
|
2019-12-20 14:55:23 +00:00
|
|
|
- have a value.
|
|
|
|
-
|
2020-03-02 19:50:40 +00:00
|
|
|
- Note: Be sure to add the config to mergeGitConfig and to
|
|
|
|
- globalConfigs.
|
2019-12-20 14:55:23 +00:00
|
|
|
-}
|
2017-02-03 17:40:14 +00:00
|
|
|
getGitConfigVal :: (GitConfig -> Configurable a) -> Annex a
|
git-annex config annex.largefiles
annex.largefiles can be configured by git-annex config, to more easily set
a default that will also be used by clones, without needing to shoehorn the
expression into the gitattributes file. The git config and gitattributes
override that.
Whenever something is added to git-annex config, we have to consider what
happens if a user puts a purposfully bad value in there. Or, if a new
git-annex adds some new value that an old git-annex can't parse.
In this case, a global annex.largefiles that can't be parsed currently
makes an error be thrown. That might not be ideal, but the gitattribute
behaves the same, and is almost equally repo-global.
Performance notes:
git-annex add and addurl construct a matcher once
and uses it for every file, so the added time penalty for reading the global
config log is minor. If the gitattributes annex.largefiles were deprecated,
git-annex add would get around 2% faster (excluding hashing), because
looking that up for each file is not fast. So this new way of setting
it is progress toward speeding up add.
git-annex smudge does need to load the log every time. As well as checking
the git attribute. Not ideal. Setting annex.gitaddtoannex=false avoids
both overheads.
2019-12-20 16:12:31 +00:00
|
|
|
getGitConfigVal f = getGitConfigVal' f >>= \case
|
|
|
|
HasGlobalConfig c -> return c
|
|
|
|
DefaultConfig d -> return d
|
|
|
|
HasGitConfig c -> return c
|
|
|
|
|
|
|
|
getGitConfigVal' :: (GitConfig -> Configurable a) -> Annex (Configurable a)
|
|
|
|
getGitConfigVal' f = (f <$> Annex.getGitConfig) >>= \case
|
|
|
|
DefaultConfig _ -> do
|
|
|
|
r <- Annex.gitRepo
|
|
|
|
m <- loadGlobalConfig
|
|
|
|
let globalgc = extractGitConfig FromGlobalConfig (r { config = m })
|
|
|
|
-- This merge of the repo-global config and the git
|
|
|
|
-- config makes all repository-global default
|
|
|
|
-- values populate the GitConfig with HasGlobalConfig
|
|
|
|
-- values, so it will only need to be done once.
|
rename changeGitConfig to overrideGitConfig and avoid unncessary calls
It's important that it be clear that it overrides a config, such that
reloading the git config won't change it, and in particular, setConfig
won't change it.
Most of the calls to changeGitConfig were actually after setConfig,
which was redundant and unncessary. So removed those.
The only remaining one, besides --debug, is in the handling of
repository-global config values. That one's ok, because the
way mergeGitConfig is implemented, it does not override any value that
is set in git config. If a value with a repo-global setting was passed
to setConfig, it would set it in the git config, reload the git config,
re-apply mergeGitConfig, and use the newly set value, which is the right
thing.
2020-02-27 05:06:35 +00:00
|
|
|
Annex.overrideGitConfig (\gc -> mergeGitConfig gc globalgc)
|
git-annex config annex.largefiles
annex.largefiles can be configured by git-annex config, to more easily set
a default that will also be used by clones, without needing to shoehorn the
expression into the gitattributes file. The git config and gitattributes
override that.
Whenever something is added to git-annex config, we have to consider what
happens if a user puts a purposfully bad value in there. Or, if a new
git-annex adds some new value that an old git-annex can't parse.
In this case, a global annex.largefiles that can't be parsed currently
makes an error be thrown. That might not be ideal, but the gitattribute
behaves the same, and is almost equally repo-global.
Performance notes:
git-annex add and addurl construct a matcher once
and uses it for every file, so the added time penalty for reading the global
config log is minor. If the gitattributes annex.largefiles were deprecated,
git-annex add would get around 2% faster (excluding hashing), because
looking that up for each file is not fast. So this new way of setting
it is progress toward speeding up add.
git-annex smudge does need to load the log every time. As well as checking
the git attribute. Not ideal. Setting annex.gitaddtoannex=false avoids
both overheads.
2019-12-20 16:12:31 +00:00
|
|
|
f <$> Annex.getGitConfig
|
|
|
|
c -> return c
|