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.

1 files changed, 6 insertions, 3 deletions

diff --git a/Test.hs b/Test.hs
index 2f632f61d..7424a5b96 100644
--- a/Test.hs
+++ b/Test.hs
@@ -292,6 +292,9 @@ test_drop_withremote :: TestEnv -> Assertion
 test_drop_withremote env = intmpclonerepo env $ do
 	git_annex env "get" [annexedfile] @? "get failed"
 	annexed_present annexedfile
+	git_annex env "numcopies" ["2"] @? "numcopies config failed"
+	not <$> git_annex env "drop" [annexedfile] @? "drop succeeded although numcopies is not satisfied"
+	git_annex env "numcopies" ["1"] @? "numcopies config failed"
 	git_annex env "drop" [annexedfile] @? "drop failed though origin has copy"
 	annexed_notpresent annexedfile
 	inmainrepo env $ annexed_present annexedfile
@@ -511,9 +514,9 @@ test_trust env = intmpclonerepo env $ do
 test_fsck_basic :: TestEnv -> Assertion
 test_fsck_basic env = intmpclonerepo env $ do
 	git_annex env "fsck" [] @? "fsck failed"
-	boolSystem "git" [Params "config annex.numcopies 2"] @? "git config failed"
+	git_annex env "numcopies" ["2"] @? "numcopies config failed"
 	fsck_should_fail env "numcopies unsatisfied"
-	boolSystem "git" [Params "config annex.numcopies 1"] @? "git config failed"
+	git_annex env "numcopies" ["1"] @? "numcopies config failed"
 	corrupt annexedfile
 	corrupt sha1annexedfile
   where
@@ -542,7 +545,7 @@ test_fsck_localuntrusted env = intmpclonerepo env $ do
 
 test_fsck_remoteuntrusted :: TestEnv -> Assertion
 test_fsck_remoteuntrusted env = intmpclonerepo env $ do
-	boolSystem "git" [Params "config annex.numcopies 2"] @? "git config failed"
+	git_annex env "numcopies" ["2"] @? "numcopies config failed"
 	git_annex env "get" [annexedfile] @? "get failed"
 	git_annex env "get" [sha1annexedfile] @? "get failed"
 	git_annex env "fsck" [] @? "fsck failed with numcopies=2 and 2 copies"