diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-01-20 16:47:56 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-01-20 16:47:56 -0400 |
| commit | 8cd1d9ed5ebf96d9e39116f63900ccd7be8d907e (patch) | |
| tree | 9d4bb88a930f28120de40556eeec906de7df39d0 /Command.hs | |
| parent | 5534e89870b7d0885f6fe113068c0514a03a74bd (diff) | |
global numcopies setting
* numcopies: New command, sets global numcopies value that is seen by all
clones of a repository.
* The annex.numcopies git config setting is deprecated. Once the numcopies
command is used to set the global number of copies, any annex.numcopies
git configs will be ignored.
* assistant: Make the prefs page set the global numcopies.
This global numcopies setting is needed to let preferred content
expressions operate on numcopies.
It's also convenient, because typically if you want git-annex to preserve N
copies of files in a repo, you want it to do that no matter which repo it's
running in. Making it global avoids needing to warn the user about gotchas
involving inconsistent annex.numcopies settings.
(See changes to doc/numcopies.mdwn.)
Added a new variety of git-annex branch log file, that holds only 1 value.
Will probably be useful for other stuff later.
This commit was sponsored by Nicolas Pouillard.
Diffstat (limited to 'Command.hs')
| -rw-r--r-- | Command.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Command.hs b/Command.hs index 555414458..e3f748dc5 100644 --- a/Command.hs +++ b/Command.hs @@ -37,6 +37,7 @@ import Checks as ReExported import Usage as ReExported import RunCommand as ReExported import Logs.Trust +import Logs.NumCopies import Config import Annex.CheckAttr @@ -88,8 +89,8 @@ isBareRepo = fromRepo Git.repoIsLocalBare numCopies :: FilePath -> Annex (Maybe Int) numCopies file = do - forced <- Annex.getState Annex.forcenumcopies - case forced of + global <- getGlobalNumCopies + case global of Just n -> return $ Just n Nothing -> readish <$> checkAttr "annex.numcopies" file |