simplify

Command/Group.hs

@@ -30,6 +30,5 @@ start _ = error "Specify a repository and a group."
 
 perform :: UUID -> Group -> CommandPerform
 perform uuid g = do
-	s <- lookupGroups uuid
+	groupChange uuid (S.insert g) 
-	groupSet uuid (S.insert g s) 
 	next $ return True

Command/Ungroup.hs

@@ -30,6 +30,5 @@ start _ = error "Specify a repository and a group."
 
 perform :: UUID -> Group -> CommandPerform
 perform uuid g = do
-	s <- lookupGroups uuid
+	groupChange uuid (S.delete g) 
-	groupSet uuid (S.delete g s) 
 	next $ return True

Logs/Group.hs

@@ -6,7 +6,7 @@
  -}
 
 module Logs.Group (
-	groupSet,
+	groupChange,
 	lookupGroups,
 	groupMap,
 ) where
@@ -29,15 +29,17 @@ groupLog = "group.log"
 lookupGroups :: UUID -> Annex (S.Set Group)
 lookupGroups u = (fromMaybe S.empty . M.lookup u) <$> groupMap
 
-{- Changes the groups for a uuid in the groupLog. -}
+{- Applies a set modifier to change the groups for a uuid in the groupLog. -}
-groupSet :: UUID -> S.Set Group -> Annex ()
+groupChange :: UUID -> (S.Set Group -> S.Set Group) -> Annex ()
-groupSet uuid@(UUID _) groups = do
+groupChange uuid@(UUID _) modifier = do
+	curr <- lookupGroups uuid
 	ts <- liftIO getPOSIXTime
 	Annex.Branch.change groupLog $
-		showLog (unwords . S.toList) . changeLog ts uuid groups . 
+		showLog (unwords . S.toList) .
-			parseLog (Just . S.fromList . words)
+			changeLog ts uuid (modifier curr) .
+				parseLog (Just . S.fromList . words)
 	Annex.changeState $ \s -> s { Annex.groupmap = Nothing }
-groupSet NoUUID _ = error "unknown UUID; cannot modify group"
+groupChange NoUUID _ = error "unknown UUID; cannot modify group"
 
 {- Read the groupLog into a map. The map is cached for speed. -}
 groupMap :: Annex GroupMap