summaryrefslogtreecommitdiff
path: root/Annex
diff options
context:
space:
mode:
Diffstat (limited to 'Annex')
-rw-r--r--Annex/Branch.hs2
-rw-r--r--Annex/CatFile.hs2
-rw-r--r--Annex/Common.hs13
-rw-r--r--Annex/Content.hs2
-rw-r--r--Annex/Exception.hs2
-rw-r--r--Annex/Queue.hs2
-rw-r--r--Annex/Version.hs2
7 files changed, 6 insertions, 19 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs
index c6db9deca..0b4bea051 100644
--- a/Annex/Branch.hs
+++ b/Annex/Branch.hs
@@ -22,7 +22,7 @@ import System.IO.Binary
import System.Exit
import qualified Data.ByteString.Lazy.Char8 as L
-import Annex.Common
+import Common.Annex
import Annex.Exception
import Types.BranchState
import qualified Git
diff --git a/Annex/CatFile.hs b/Annex/CatFile.hs
index 4f98815f8..2707ed3ea 100644
--- a/Annex/CatFile.hs
+++ b/Annex/CatFile.hs
@@ -9,7 +9,7 @@ module Annex.CatFile (
catFile
) where
-import Annex.Common
+import Common.Annex
import qualified Git.CatFile
import qualified Annex
diff --git a/Annex/Common.hs b/Annex/Common.hs
deleted file mode 100644
index ca7b1bff7..000000000
--- a/Annex/Common.hs
+++ /dev/null
@@ -1,13 +0,0 @@
-module Annex.Common (
- module Common,
- module Types,
- module Annex,
- module Locations,
- module Messages,
-) where
-
-import Common
-import Types
-import Annex (gitRepo)
-import Locations
-import Messages
diff --git a/Annex/Content.hs b/Annex/Content.hs
index a3fa79da8..21403954a 100644
--- a/Annex/Content.hs
+++ b/Annex/Content.hs
@@ -21,7 +21,7 @@ module Annex.Content (
saveState
) where
-import Annex.Common
+import Common.Annex
import LocationLog
import UUID
import qualified Git
diff --git a/Annex/Exception.hs b/Annex/Exception.hs
index 7ea8fb89a..c147439a1 100644
--- a/Annex/Exception.hs
+++ b/Annex/Exception.hs
@@ -15,7 +15,7 @@ import Control.Exception.Control (handle)
import Control.Monad.IO.Control (liftIOOp)
import Control.Exception hiding (handle, throw)
-import Annex.Common
+import Common.Annex
{- Runs an Annex action, with setup and cleanup both in the IO monad. -}
bracketIO :: IO c -> (c -> IO b) -> Annex a -> Annex a
diff --git a/Annex/Queue.hs b/Annex/Queue.hs
index 8d0a32bec..4c1182750 100644
--- a/Annex/Queue.hs
+++ b/Annex/Queue.hs
@@ -11,7 +11,7 @@ module Annex.Queue (
flushWhenFull
) where
-import Annex.Common
+import Common.Annex
import Annex
import qualified Git.Queue
diff --git a/Annex/Version.hs b/Annex/Version.hs
index e501dbf2e..935f777ab 100644
--- a/Annex/Version.hs
+++ b/Annex/Version.hs
@@ -7,7 +7,7 @@
module Annex.Version where
-import Annex.Common
+import Common.Annex
import qualified Git
import Config