rename --ingroup to --inallgroup

5 files changed, 15 insertions, 9 deletions

diff --git a/GitAnnex.hs b/GitAnnex.hs
index b05fc3607..090108416 100644
--- a/GitAnnex.hs
+++ b/GitAnnex.hs
@@ -147,7 +147,7 @@ options = Option.common ++
 		"skip files with fewer copies"
 	, Option ['B'] ["inbackend"] (ReqArg Limit.addInBackend paramName)
 		"skip files not using a key-value backend"
-	, Option [] ["ingroup"] (ReqArg Limit.addInGroup paramGroup)
+	, Option [] ["inallgroup"] (ReqArg Limit.addInAllGroup paramGroup)
 		"skip files not present in all remotes in a group"
 	, Option [] ["largerthan"] (ReqArg Limit.addLargerThan paramSize)
 		"skip files larger than a size"
diff --git a/Limit.hs b/Limit.hs
index f9e8de270..f39e2d6b8 100644
--- a/Limit.hs
+++ b/Limit.hs
@@ -139,13 +139,13 @@ limitCopies want = case split ":" want of
 
 {- Adds a limit to skip files not believed to be present in all
  - repositories in the specified group. -}
-addInGroup :: String -> Annex ()
-addInGroup groupname = do
+addInAllGroup :: String -> Annex ()
+addInAllGroup groupname = do
 	m <- groupMap
-	addLimit $ limitInGroup m groupname
+	addLimit $ limitInAllGroup m groupname
 
-limitInGroup :: GroupMap -> MkLimit
-limitInGroup m groupname
+limitInAllGroup :: GroupMap -> MkLimit
+limitInAllGroup m groupname
 	| S.null want = Right $ const $ const $ return True
 	| otherwise = Right $ \notpresent ->
 		Backend.lookupFile >=> check notpresent
diff --git a/Logs/PreferredContent.hs b/Logs/PreferredContent.hs
index 26e0d7073..1f0c6a6fe 100644
--- a/Logs/PreferredContent.hs
+++ b/Logs/PreferredContent.hs
@@ -102,7 +102,7 @@ parseToken groupmap t
 			, ("inbackend", limitInBackend)
 			, ("largerthan", limitSize (>))
 			, ("smallerthan", limitSize (<))
-			, ("ingroup", limitInGroup groupmap)
+			, ("inallgroup", limitInAllGroup groupmap)
 			]
 		use a = Utility.Matcher.Operation <$> a v
 
diff --git a/debian/changelog b/debian/changelog
index eae9e434b..0fc4cda17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-annex (3.20121010) UNRELEASED; urgency=low
+
+  * Renamed --ingroup to --inallgroup.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 10 Oct 2012 12:59:25 -0400
+
 git-annex (3.20121009) unstable; urgency=low
 
   * watch, assistant: It's now safe to git annex unlock files while
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index bfdbbf737..2721cd22d 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -636,14 +636,14 @@ file contents are present at either of two repositories.
 
   Matches only files that git-annex believes have the specified number of
   copies, on remotes in the specified group. For example,
-  "--copies=archival:2"
+  "--copies=archive:2"
 
 * --inbackend=name
 
   Matches only files whose content is stored using the specified key-value
   backend.
 
-* --ingroup=groupname
+* --inallgroup=groupname
 
   Matches only files that git-annex believes are present in all repositories
   in the specified group.