From 8cd1d9ed5ebf96d9e39116f63900ccd7be8d907e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 20 Jan 2014 16:47:56 -0400 Subject: 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. --- Config.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Config.hs') diff --git a/Config.hs b/Config.hs index 5003c1ce0..0ccf1b5c0 100644 --- a/Config.hs +++ b/Config.hs @@ -71,7 +71,10 @@ setRemoteAvailability r c = setConfig (remoteConfig r "availability") (show c) getNumCopies :: Maybe Int -> Annex Int getNumCopies (Just v) = return v -getNumCopies Nothing = annexNumCopies <$> Annex.getGitConfig +getNumCopies Nothing = deprecatedNumCopies + +deprecatedNumCopies :: Annex Int +deprecatedNumCopies = fromMaybe 1 . annexNumCopies <$> Annex.getGitConfig isDirect :: Annex Bool isDirect = annexDirect <$> Annex.getGitConfig -- cgit v1.2.3