Merge branch 'master' into new-monad-control

Conflicts:
	git-annex.cabal
This commit is contained in:
Joey Hess 2011-12-11 16:55:36 -04:00
commit e04852c8af
66 changed files with 997 additions and 246 deletions

View file

@ -37,6 +37,7 @@ import Types.BranchState
import Types.TrustLevel
import Types.UUID
import qualified Utility.Matcher
import qualified Data.Map as M
-- git-annex's monad
newtype Annex a = Annex { runAnnex :: StateT AnnexState IO a }
@ -81,7 +82,7 @@ data AnnexState = AnnexState
, limit :: Either [Utility.Matcher.Token (FilePath -> Annex Bool)] (Utility.Matcher.Matcher (FilePath -> Annex Bool))
, forcetrust :: [(UUID, TrustLevel)]
, trustmap :: Maybe TrustMap
, cipher :: Maybe Cipher
, ciphers :: M.Map EncryptedCipher Cipher
}
newState :: Git.Repo -> AnnexState
@ -104,7 +105,7 @@ newState gitrepo = AnnexState
, limit = Left []
, forcetrust = []
, trustmap = Nothing
, cipher = Nothing
, ciphers = M.empty
}
{- Create and returns an Annex state object for the specified git repo. -}