diff options
author | 2011-12-11 16:55:36 -0400 | |
---|---|---|
committer | 2011-12-11 16:55:36 -0400 | |
commit | e04852c8af22f784d184a001b9fee04adb1828c1 (patch) | |
tree | 025caa9f08d1c3ad0479bd14370851b0bef4afd3 /Annex.hs | |
parent | 730041688d616bff4df745c6605bbaff52733513 (diff) | |
parent | 81f311103d99ec5bfd31ae5a76d6add05ff40121 (diff) |
Merge branch 'master' into new-monad-control
Conflicts:
git-annex.cabal
Diffstat (limited to 'Annex.hs')
-rw-r--r-- | Annex.hs | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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. -} |