rename

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

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
 

Annex/Common.hs

@@ -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

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

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

Annex/Queue.hs

@@ -11,7 +11,7 @@ module Annex.Queue (
 	flushWhenFull
 ) where
 
-import Annex.Common
+import Common.Annex
 import Annex
 import qualified Git.Queue
 

Annex/Version.hs

@@ -7,7 +7,7 @@
 
 module Annex.Version where
 
-import Annex.Common
+import Common.Annex
 import qualified Git
 import Config