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

Backend.hs

@@ -19,7 +19,7 @@ module Backend (
 import System.IO.Error (try)
 import System.Posix.Files
 
-import Annex.Common
+import Common.Annex
 import qualified Git
 import qualified Annex
 import Types.Key

Backend/SHA.hs

@@ -7,7 +7,7 @@
 
 module Backend.SHA (backends) where
 
-import Annex.Common
+import Common.Annex
 import qualified Annex
 import Annex.Content
 import Types.Backend

Backend/URL.hs

@@ -10,7 +10,7 @@ module Backend.URL (
 	fromUrl
 ) where
 
-import Annex.Common
+import Common.Annex
 import Types.Backend
 import Types.Key
 

Backend/WORM.hs

@@ -7,7 +7,7 @@
 
 module Backend.WORM (backends) where
 
-import Annex.Common
+import Common.Annex
 import Types.Backend
 import Types.Key
 

CmdLine.hs

@@ -14,7 +14,7 @@ module CmdLine (
 import System.IO.Error (try)
 import System.Console.GetOpt
 
-import Annex.Common
+import Common.Annex
 import qualified Annex
 import qualified Annex.Queue
 import qualified Git

Command.hs

@@ -7,7 +7,7 @@
 
 module Command where
 
-import Annex.Common
+import Common.Annex
 import qualified Backend
 import qualified Annex
 import qualified Git

Command/Add.hs

@@ -7,7 +7,7 @@
 
 module Command.Add where
 
-import Annex.Common
+import Common.Annex
 import Annex.Exception
 import Command
 import qualified Annex

Command/AddUrl.hs

@@ -9,7 +9,7 @@ module Command.AddUrl where
 
 import Network.URI
 
-import Annex.Common
+import Common.Annex
 import Command
 import qualified Backend
 import qualified Utility.Url as Url

Command/ConfigList.hs

@@ -7,7 +7,7 @@
 
 module Command.ConfigList where
 
-import Annex.Common
+import Common.Annex
 import Command
 import UUID
 

Command/Describe.hs

@@ -7,7 +7,7 @@
 
 module Command.Describe where
 
-import Annex.Common
+import Common.Annex
 import Command
 import qualified Remote
 import UUID

Command/Drop.hs

@@ -7,7 +7,7 @@
 
 module Command.Drop where
 
-import Annex.Common
+import Common.Annex
 import Command
 import qualified Remote
 import qualified Annex

Command/DropKey.hs

@@ -7,7 +7,7 @@
 
 module Command.DropKey where
 
-import Annex.Common
+import Common.Annex
 import Command
 import qualified Annex
 import LocationLog

Command/DropUnused.hs

@@ -9,7 +9,7 @@ module Command.DropUnused where
 
 import qualified Data.Map as M
 
-import Annex.Common
+import Common.Annex
 import Command
 import qualified Annex
 import qualified Command.Drop

Command/Find.hs

@@ -7,7 +7,7 @@
 
 module Command.Find where
 
-import Annex.Common
+import Common.Annex
 import Command
 import Annex.Content
 import Limit

Command/Fix.hs

@@ -7,7 +7,7 @@
 
 module Command.Fix where
 
-import Annex.Common
+import Common.Annex
 import Command
 import qualified Annex.Queue
 import Annex.Content

Command/FromKey.hs

@@ -7,7 +7,7 @@
 
 module Command.FromKey where
 
-import Annex.Common
+import Common.Annex
 import Command
 import qualified Annex.Queue
 import Annex.Content

Command/Fsck.hs

@@ -7,7 +7,7 @@
 
 module Command.Fsck where
 
-import Annex.Common
+import Common.Annex
 import Command
 import qualified Remote
 import qualified Types.Backend

Command/Get.hs

@@ -7,7 +7,7 @@
 
 module Command.Get where
 
-import Annex.Common
+import Common.Annex
 import Command
 import qualified Annex
 import qualified Remote

Command/InAnnex.hs

@@ -7,7 +7,7 @@
 
 module Command.InAnnex where
 
-import Annex.Common
+import Common.Annex
 import Command
 import Annex.Content
 

Command/Init.hs

@@ -7,7 +7,7 @@
 
 module Command.Init where
 
-import Annex.Common
+import Common.Annex
 import Command
 import UUID
 import Init

Command/InitRemote.hs

@@ -9,7 +9,7 @@ module Command.InitRemote where
 
 import qualified Data.Map as M
 
-import Annex.Common
+import Common.Annex
 import Command
 import qualified Remote
 import qualified RemoteLog

Command/Lock.hs

@@ -7,7 +7,7 @@
 
 module Command.Lock where
 
-import Annex.Common
+import Common.Annex
 import Command
 import qualified Annex.Queue
 import Backend

Command/Map.hs

@@ -10,7 +10,7 @@ module Command.Map where
 import Control.Exception.Extensible
 import qualified Data.Map as M
 
-import Annex.Common
+import Common.Annex
 import Command
 import qualified Git
 import UUID

Command/Merge.hs

@@ -7,7 +7,7 @@
 
 module Command.Merge where
 
-import Annex.Common
+import Common.Annex
 import Command
 import qualified Annex.Branch
 

Command/Migrate.hs

@@ -7,7 +7,7 @@
 
 module Command.Migrate where
 
-import Annex.Common
+import Common.Annex
 import Command
 import qualified Backend
 import qualified Types.Key

Command/Move.hs

@@ -7,7 +7,7 @@
 
 module Command.Move where
 
-import Annex.Common
+import Common.Annex
 import Command
 import qualified Command.Drop
 import qualified Annex

Command/RecvKey.hs

@@ -7,7 +7,7 @@
 
 module Command.RecvKey where
 
-import Annex.Common
+import Common.Annex
 import Command
 import CmdLine
 import Annex.Content

Command/Semitrust.hs

@@ -7,7 +7,7 @@
 
 module Command.Semitrust where
 
-import Annex.Common
+import Common.Annex
 import Command
 import qualified Remote
 import UUID

Command/SendKey.hs

@@ -7,7 +7,7 @@
 
 module Command.SendKey where
 
-import Annex.Common
+import Common.Annex
 import Command
 import Annex.Content
 import Utility.RsyncFile

Command/SetKey.hs

@@ -7,7 +7,7 @@
 
 module Command.SetKey where
 
-import Annex.Common
+import Common.Annex
 import Command
 import LocationLog
 import Annex.Content

Command/Status.hs

@@ -12,7 +12,7 @@ import qualified Data.Map as M
 import qualified Data.Set as S
 import Data.Set (Set)
 
-import Annex.Common
+import Common.Annex
 import qualified Types.Backend as B
 import qualified Types.Remote as R
 import qualified Remote

Command/Trust.hs

@@ -7,7 +7,7 @@
 
 module Command.Trust where
 
-import Annex.Common
+import Common.Annex
 import Command
 import qualified Remote
 import Trust

Command/Unannex.hs

@@ -7,7 +7,7 @@
 
 module Command.Unannex where
 
-import Annex.Common
+import Common.Annex
 import Command
 import qualified Command.Drop
 import qualified Annex

Command/Uninit.hs

@@ -7,7 +7,7 @@
 
 module Command.Uninit where
 
-import Annex.Common
+import Common.Annex
 import Command
 import qualified Git
 import qualified Annex

Command/Unlock.hs

@@ -7,7 +7,7 @@
 
 module Command.Unlock where
 
-import Annex.Common
+import Common.Annex
 import Command
 import Annex.Content
 import Utility.CopyFile

Command/Untrust.hs

@@ -7,7 +7,7 @@
 
 module Command.Untrust where
 
-import Annex.Common
+import Common.Annex
 import Command
 import qualified Remote
 import UUID

Command/Unused.hs

@@ -12,7 +12,7 @@ module Command.Unused where
 import qualified Data.Set as S
 import qualified Data.ByteString.Lazy.Char8 as L
 
-import Annex.Common
+import Common.Annex
 import Command
 import Annex.Content
 import Utility.FileMode

Command/Upgrade.hs

@@ -7,7 +7,7 @@
 
 module Command.Upgrade where
 
-import Annex.Common
+import Common.Annex
 import Command
 import Upgrade
 import Annex.Version

Command/Version.hs

@@ -7,7 +7,7 @@
 
 module Command.Version where
 
-import Annex.Common
+import Common.Annex
 import Command
 import qualified Build.SysConfig as SysConfig
 import Annex.Version

Command/Whereis.hs

@@ -7,7 +7,7 @@
 
 module Command.Whereis where
 
-import Annex.Common
+import Common.Annex
 import LocationLog
 import Command
 import Remote

Common/Annex.hs

@@ -1,4 +1,4 @@
-module Annex.Common (
+module Common.Annex (
 	module Common,
 	module Types,
 	module Annex,

Config.hs

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

Crypto.hs

@@ -37,7 +37,7 @@ import Control.Exception (finally)
 import System.Exit
 import System.Environment
 
-import Annex.Common
+import Common.Annex
 import Types.Key
 import Types.Remote
 import Utility.Base64

GitAnnex.hs

@@ -9,7 +9,7 @@ module GitAnnex where
 
 import System.Console.GetOpt
 
-import Annex.Common
+import Common.Annex
 import qualified Git
 import CmdLine
 import Command

Init.hs

@@ -11,7 +11,7 @@ module Init (
 	uninitialize
 ) where
 
-import Annex.Common
+import Common.Annex
 import qualified Git
 import qualified Annex.Branch
 import Annex.Version

Limit.hs

@@ -10,7 +10,7 @@ module Limit where
 import Text.Regex.PCRE.Light.Char8
 import System.Path.WildMatch
 
-import Annex.Common
+import Common.Annex
 import qualified Annex
 import qualified Utility.Matcher
 import qualified Remote

LocationLog.hs

@@ -21,7 +21,7 @@ module LocationLog (
 	logFileKey
 ) where
 
-import Annex.Common
+import Common.Annex
 import qualified Git
 import qualified Annex.Branch
 import UUID

Options.hs

@@ -10,7 +10,7 @@ module Options where
 import System.Console.GetOpt
 import System.Log.Logger
 
-import Annex.Common
+import Common.Annex
 import qualified Annex
 import Command
 import Limit

PresenceLog.hs

@@ -27,7 +27,7 @@ import Data.Time
 import System.Locale
 import qualified Data.Map as M
 
-import Annex.Common
+import Common.Annex
 import qualified Annex.Branch
 
 data LogLine = LogLine {

Remote.hs

@@ -32,7 +32,7 @@ import qualified Data.Map as M
 import Text.JSON
 import Text.JSON.Generic
 
-import Annex.Common
+import Common.Annex
 import Types.Remote
 import UUID
 import qualified Annex

Remote/Bup.hs

@@ -12,7 +12,7 @@ import System.IO.Error
 import qualified Data.Map as M
 import System.Process
 
-import Annex.Common
+import Common.Annex
 import Types.Remote
 import qualified Git
 import UUID

Remote/Directory.hs

@@ -11,7 +11,7 @@ import qualified Data.ByteString.Lazy.Char8 as L
 import System.IO.Error
 import qualified Data.Map as M
 
-import Annex.Common
+import Common.Annex
 import Utility.CopyFile
 import Types.Remote
 import qualified Git

Remote/Git.hs

@@ -10,7 +10,7 @@ module Remote.Git (remote) where
 import Control.Exception.Extensible
 import qualified Data.Map as M
 
-import Annex.Common
+import Common.Annex
 import Utility.CopyFile
 import Utility.RsyncFile
 import Utility.Ssh

Remote/Helper/Encryptable.hs

@@ -9,7 +9,7 @@ module Remote.Helper.Encryptable where
 
 import qualified Data.Map as M
 
-import Annex.Common
+import Common.Annex
 import Types.Remote
 import Crypto
 import qualified Annex

Remote/Helper/Special.hs

@@ -9,7 +9,7 @@ module Remote.Helper.Special where
 
 import qualified Data.Map as M
 
-import Annex.Common
+import Common.Annex
 import Types.Remote
 import qualified Git
 import UUID

Remote/Hook.hs

@@ -12,7 +12,7 @@ import qualified Data.Map as M
 import System.IO.Error (try)
 import System.Exit
 
-import Annex.Common
+import Common.Annex
 import Types.Remote
 import qualified Git
 import UUID

Remote/Rsync.hs

@@ -10,7 +10,7 @@ module Remote.Rsync (remote) where
 import qualified Data.ByteString.Lazy.Char8 as L
 import qualified Data.Map as M
 
-import Annex.Common
+import Common.Annex
 import Types.Remote
 import qualified Git
 import UUID

Remote/S3real.hs

@@ -17,7 +17,7 @@ import Data.Char
 import System.Environment
 import System.Posix.Env (setEnv)
 
-import Annex.Common
+import Common.Annex
 import Types.Remote
 import Types.Key
 import qualified Git

Remote/Web.hs

@@ -10,7 +10,7 @@ module Remote.Web (
 	setUrl
 ) where
 
-import Annex.Common
+import Common.Annex
 import Types.Remote
 import qualified Git
 import UUID

RemoteLog.hs

@@ -18,7 +18,7 @@ module RemoteLog (
 import qualified Data.Map as M
 import Data.Char
 
-import Annex.Common
+import Common.Annex
 import qualified Annex.Branch
 import Types.Remote
 import UUID

Trust.hs

@@ -15,7 +15,7 @@ module Trust (
 
 import qualified Data.Map as M
 
-import Annex.Common
+import Common.Annex
 import Types.TrustLevel
 import qualified Annex.Branch
 import UUID

UUID.hs

@@ -24,7 +24,7 @@ module UUID (
 
 import qualified Data.Map as M
 
-import Annex.Common
+import Common.Annex
 import qualified Git
 import qualified Annex.Branch
 import Types.UUID

Upgrade.hs

@@ -7,7 +7,7 @@
 
 module Upgrade where
 
-import Annex.Common
+import Common.Annex
 import Annex.Version
 import qualified Upgrade.V0
 import qualified Upgrade.V1

Upgrade/V0.hs

@@ -9,7 +9,7 @@ module Upgrade.V0 where
 
 import System.IO.Error (try)
 
-import Annex.Common
+import Common.Annex
 import Annex.Content
 import qualified Upgrade.V1
 

Upgrade/V1.hs

@@ -11,7 +11,7 @@ import System.IO.Error (try)
 import System.Posix.Types
 import Data.Char
 
-import Annex.Common
+import Common.Annex
 import Types.Key
 import Annex.Content
 import PresenceLog

Upgrade/V2.hs

@@ -7,7 +7,7 @@
 
 module Upgrade.V2 where
 
-import Annex.Common
+import Common.Annex
 import qualified Git
 import qualified Annex.Branch
 import LocationLog

git-annex-shell.hs

@@ -7,7 +7,7 @@
 
 import System.Environment
 
-import Annex.Common
+import Common.Annex
 import qualified Git
 import CmdLine
 import Command