use a Set

4 files changed, 17 insertions, 16 deletions

diff --git a/Annex/Difference.hs b/Annex/Difference.hs
index 07789e7bb..66dc03a32 100644
--- a/Annex/Difference.hs
+++ b/Annex/Difference.hs
@@ -34,7 +34,7 @@ setDifferences = do
 	otherds <- allDifferences <$> recordedDifferences
 	ds <- mappend otherds . annexDifferences <$> Annex.getGitConfig
 	when (ds /= mempty) $ do
-		ds'@(Differences l) <- ifM (isJust <$> getVersion)
+		ds' <- ifM (isJust <$> getVersion)
 			( do
 				oldds <- recordedDifferencesFor u
 				when (ds /= oldds) $
@@ -53,6 +53,6 @@ setDifferences = do
 						return otherds
 					else return ds
 			)
-		forM_ l $ \d ->
+		forM_ (listDifferences ds') $ \d ->
 			setConfig (ConfigKey $ differenceConfigKey d) (differenceConfigVal d)
 		recordDifferences ds' u
diff --git a/Annex/DirHashes.hs b/Annex/DirHashes.hs
index b58b5a215..03769350d 100644
--- a/Annex/DirHashes.hs
+++ b/Annex/DirHashes.hs
@@ -42,7 +42,7 @@ branchHashLevels = configHashLevels OneLevelBranchHash
 
 configHashLevels :: Difference -> GitConfig -> HashLevels
 configHashLevels d config
-	| hasDifference (== d) (annexDifferences config) = HashLevels 1
+	| hasDifference d (annexDifferences config) = HashLevels 1
 	| otherwise = def
 
 branchHashDir :: GitConfig -> Key -> String
diff --git a/Locations.hs b/Locations.hs
index c5221d8bc..bf313dbc8 100644
--- a/Locations.hs
+++ b/Locations.hs
@@ -137,7 +137,7 @@ gitAnnexLocation' key r config crippled
 	 -}
 	| Git.repoIsLocalBare r 
 		|| crippled 
-		|| hasDifference (== ObjectHashLower) (annexDifferences config) =
+		|| hasDifference ObjectHashLower (annexDifferences config) =
 			check $ map inrepo $ annexLocations config key
 	{- Non-bare repositories only use hashDirMixed, so
 	 - don't need to do any work to check if the file is
diff --git a/Types/Difference.hs b/Types/Difference.hs
index e4562a0d6..74bac0aca 100644
--- a/Types/Difference.hs
+++ b/Types/Difference.hs
@@ -13,15 +13,16 @@ module Types.Difference (
 	differenceConfigKey,
 	differenceConfigVal,
 	hasDifference,
+	listDifferences,
 ) where
 
 import Utility.PartialPrelude
 import qualified Git
 import qualified Git.Config
 
-import Data.List
 import Data.Maybe
 import Data.Monoid
+import qualified Data.Set as S
 
 -- Describes differences from the v5 repository format.
 --
@@ -45,27 +46,23 @@ data Difference
 	deriving (Show, Read, Ord, Eq, Enum, Bounded)
 
 data Differences
-	= Differences [Difference]
+	= Differences (S.Set Difference)
 	| UnknownDifferences
 
 instance Eq Differences where
-	Differences a == Differences b = canon a == canon b
+	Differences a == Differences b = a == b
 	_ == _ = False -- UnknownDifferences cannot be equal
 
 instance Monoid Differences where
-	mempty = Differences []
-	mappend (Differences l1) (Differences l2) = Differences (canon (l1 ++ l2))
+	mempty = Differences S.empty
+	mappend (Differences a) (Differences b) = Differences (S.union a b)
 	mappend _ _ = UnknownDifferences
 
--- Canonical form, allowing comparison.
-canon :: [Difference] -> [Difference]
-canon = nub . sort
-
 readDifferences :: String -> Differences
 readDifferences = maybe UnknownDifferences Differences . readish
 
 getDifferences :: Git.Repo -> Differences
-getDifferences r = Differences $ catMaybes $
+getDifferences r = Differences $ S.fromList $ catMaybes $
 	map getmaybe [minBound .. maxBound]
   where
 	getmaybe d = case Git.Config.isTrue =<< Git.Config.getMaybe (differenceConfigKey d) r of
@@ -83,6 +80,10 @@ differenceConfigVal _ = Git.Config.boolConfig True
 tunable :: String -> String
 tunable k = "annex.tune." ++ k
 
-hasDifference :: (Difference -> Bool) -> Differences -> Bool
-hasDifference f (Differences l) = any f l
+hasDifference :: Difference -> Differences -> Bool
+hasDifference d (Differences s) = S.member d s
 hasDifference _ UnknownDifferences = False
+
+listDifferences :: Differences -> [Difference]
+listDifferences (Differences s) = S.toList s
+listDifferences UnknownDifferences = []