Add --trust, --untrust, and --semitrust options.

1 files changed, 12 insertions, 18 deletions

diff --git a/Trust.hs b/Trust.hs
index 7b2cf9ff8..d6d0516ab 100644
--- a/Trust.hs
+++ b/Trust.hs
@@ -1,4 +1,4 @@
-{- git-annex trust levels
+{- git-annex trust
  -
  - Copyright 2010 Joey Hess <joey@kitenet.net>
  -
@@ -17,26 +17,15 @@ module Trust (
 import Control.Monad.State
 import qualified Data.Map as M
 
+import TrustLevel
 import qualified GitRepo as Git
 import Types
 import UUID
 import Locations
 import qualified Annex
+import qualified Remote
 import Utility
 
-data TrustLevel = SemiTrusted | UnTrusted | Trusted
-	deriving Eq
-
-instance Show TrustLevel where
-        show SemiTrusted = "?"
-        show UnTrusted = "0"
-        show Trusted = "1"
-
-instance Read TrustLevel where
-        readsPrec _ "1" = [(Trusted, "")]
-        readsPrec _ "0" = [(UnTrusted, "")]
-	readsPrec _ _ = [(SemiTrusted, "")]
-
 {- Filename of trust.log. -}
 trustLog :: Annex FilePath
 trustLog = do
@@ -49,18 +38,23 @@ trustGet level = do
 	m <- trustMap
 	return $ M.keys $ M.filter (== level) m
 
-{- Read the trustLog into a map. -}
+{- Read the trustLog into a map, overriding with any
+ - values from forcetrust -}
 trustMap :: Annex (M.Map UUID TrustLevel)
 trustMap = do
 	logfile <- trustLog
+	overrides <- Annex.getState Annex.forcetrust >>= mapM findoverride
 	s <- liftIO $ catch (readFile logfile) ignoreerror
-	return $ trustMapParse s
+	return $ M.fromList $ trustMapParse s ++ overrides
 	where
                 ignoreerror _ = return ""
+		findoverride (name, t) = do
+			uuid <- Remote.nameToUUID name
+			return (uuid, t)
 
 {- Trust map parser. -}
-trustMapParse :: String -> M.Map UUID TrustLevel
-trustMapParse s = M.fromList $ map pair $ filter (not . null) $ lines s
+trustMapParse :: String -> [(UUID, TrustLevel)]
+trustMapParse s = map pair $ filter (not . null) $ lines s
 	where
 		pair l
 			| length w > 1 = (w !! 0, read (w !! 1) :: TrustLevel)