summaryrefslogtreecommitdiff
path: root/Annex.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-11-09 01:15:51 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-11-09 01:33:20 -0400
commit56b8194470f0ddc1b3e1c51da8ca55a5c9c2eb05 (patch)
treea03330e0fd21dc8f2f433fb3f5b568418037db8c /Annex.hs
parentbf460a0a98d7e4c7f4eac525fcf300629db582b6 (diff)
cleanup
Diffstat (limited to 'Annex.hs')
-rw-r--r--Annex.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Annex.hs b/Annex.hs
index 501e54c66..1c1091799 100644
--- a/Annex.hs
+++ b/Annex.hs
@@ -1,6 +1,6 @@
{- git-annex monad
-
- - Copyright 2010 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2011 Joey Hess <joey@kitenet.net>
-
- Licensed under the GNU GPL version 3 or higher.
-}
@@ -48,6 +48,8 @@ newtype Annex a = Annex { runAnnex :: StateT AnnexState IO a }
Applicative
)
+data OutputType = NormalOutput | QuietOutput | JSONOutput
+
-- internal state storage
data AnnexState = AnnexState
{ repo :: Git.Repo
@@ -70,8 +72,6 @@ data AnnexState = AnnexState
, cipher :: Maybe Cipher
}
-data OutputType = NormalOutput | QuietOutput | JSONOutput
-
newState :: Git.Repo -> AnnexState
newState gitrepo = AnnexState
{ repo = gitrepo