diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-10-05 16:02:51 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-10-05 16:02:51 -0400 |
| commit | 6a6ea06cee8ce69f391f7ce78b98b8f26a599e66 (patch) | |
| tree | 99821d5d19bd0db96bf43596c3eb9d38824b33cc | |
| parent | c199a01dd13e3c25bebcf6e67b9f870dc9be5ce8 (diff) | |
rename
73 files changed, 73 insertions, 73 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/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 diff --git a/Backend.hs b/Backend.hs index 9a7df692c..d1ff11405 100644 --- a/Backend.hs +++ b/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 diff --git a/Backend/SHA.hs b/Backend/SHA.hs index 2be02c9f6..4b5b14cc3 100644 --- a/Backend/SHA.hs +++ b/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 diff --git a/Backend/URL.hs b/Backend/URL.hs index 555e0617c..32a72335a 100644 --- a/Backend/URL.hs +++ b/Backend/URL.hs @@ -10,7 +10,7 @@ module Backend.URL ( fromUrl ) where -import Annex.Common +import Common.Annex import Types.Backend import Types.Key diff --git a/Backend/WORM.hs b/Backend/WORM.hs index b45ec7b0c..5a3e2d694 100644 --- a/Backend/WORM.hs +++ b/Backend/WORM.hs @@ -7,7 +7,7 @@ module Backend.WORM (backends) where -import Annex.Common +import Common.Annex import Types.Backend import Types.Key diff --git a/CmdLine.hs b/CmdLine.hs index faf5222a2..b1c9c1728 100644 --- a/CmdLine.hs +++ b/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 diff --git a/Command.hs b/Command.hs index 1f418b870..6f8684e4a 100644 --- a/Command.hs +++ b/Command.hs @@ -7,7 +7,7 @@ module Command where -import Annex.Common +import Common.Annex import qualified Backend import qualified Annex import qualified Git diff --git a/Command/Add.hs b/Command/Add.hs index 70b38e809..e6e7a7c77 100644 --- a/Command/Add.hs +++ b/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 diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs index 35f85ca26..c5417bf5b 100644 --- a/Command/AddUrl.hs +++ b/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 diff --git a/Command/ConfigList.hs b/Command/ConfigList.hs index 443656f17..d52c33f3b 100644 --- a/Command/ConfigList.hs +++ b/Command/ConfigList.hs @@ -7,7 +7,7 @@ module Command.ConfigList where -import Annex.Common +import Common.Annex import Command import UUID diff --git a/Command/Describe.hs b/Command/Describe.hs index 48f74dcd8..336804639 100644 --- a/Command/Describe.hs +++ b/Command/Describe.hs @@ -7,7 +7,7 @@ module Command.Describe where -import Annex.Common +import Common.Annex import Command import qualified Remote import UUID diff --git a/Command/Drop.hs b/Command/Drop.hs index 45feab2f3..fabacbb72 100644 --- a/Command/Drop.hs +++ b/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 diff --git a/Command/DropKey.hs b/Command/DropKey.hs index 185041ad0..35ebfc219 100644 --- a/Command/DropKey.hs +++ b/Command/DropKey.hs @@ -7,7 +7,7 @@ module Command.DropKey where -import Annex.Common +import Common.Annex import Command import qualified Annex import LocationLog diff --git a/Command/DropUnused.hs b/Command/DropUnused.hs index c4d9b765e..005068556 100644 --- a/Command/DropUnused.hs +++ b/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 diff --git a/Command/Find.hs b/Command/Find.hs index b8c9eeec2..98501078e 100644 --- a/Command/Find.hs +++ b/Command/Find.hs @@ -7,7 +7,7 @@ module Command.Find where -import Annex.Common +import Common.Annex import Command import Annex.Content import Limit diff --git a/Command/Fix.hs b/Command/Fix.hs index 44e36009b..5b6f1f7a4 100644 --- a/Command/Fix.hs +++ b/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 diff --git a/Command/FromKey.hs b/Command/FromKey.hs index f4dceb331..1b05d71fb 100644 --- a/Command/FromKey.hs +++ b/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 diff --git a/Command/Fsck.hs b/Command/Fsck.hs index 0a7500320..689271dd7 100644 --- a/Command/Fsck.hs +++ b/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 diff --git a/Command/Get.hs b/Command/Get.hs index c9fdf5653..acf7e0722 100644 --- a/Command/Get.hs +++ b/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 diff --git a/Command/InAnnex.hs b/Command/InAnnex.hs index 05544366b..773693b65 100644 --- a/Command/InAnnex.hs +++ b/Command/InAnnex.hs @@ -7,7 +7,7 @@ module Command.InAnnex where -import Annex.Common +import Common.Annex import Command import Annex.Content diff --git a/Command/Init.hs b/Command/Init.hs index 1a306ae96..ace06c2c3 100644 --- a/Command/Init.hs +++ b/Command/Init.hs @@ -7,7 +7,7 @@ module Command.Init where -import Annex.Common +import Common.Annex import Command import UUID import Init diff --git a/Command/InitRemote.hs b/Command/InitRemote.hs index 5080b7b2b..918604f85 100644 --- a/Command/InitRemote.hs +++ b/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 diff --git a/Command/Lock.hs b/Command/Lock.hs index 9acc5fe4a..c6c66a158 100644 --- a/Command/Lock.hs +++ b/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 diff --git a/Command/Map.hs b/Command/Map.hs index 39737289c..1155c4a6e 100644 --- a/Command/Map.hs +++ b/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 diff --git a/Command/Merge.hs b/Command/Merge.hs index 1de1eb6ee..eef2f3857 100644 --- a/Command/Merge.hs +++ b/Command/Merge.hs @@ -7,7 +7,7 @@ module Command.Merge where -import Annex.Common +import Common.Annex import Command import qualified Annex.Branch diff --git a/Command/Migrate.hs b/Command/Migrate.hs index a9591a81a..23ed6fd16 100644 --- a/Command/Migrate.hs +++ b/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 diff --git a/Command/Move.hs b/Command/Move.hs index 06d58d602..d650c5251 100644 --- a/Command/Move.hs +++ b/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 diff --git a/Command/RecvKey.hs b/Command/RecvKey.hs index babe04cd0..d3b77d8ac 100644 --- a/Command/RecvKey.hs +++ b/Command/RecvKey.hs @@ -7,7 +7,7 @@ module Command.RecvKey where -import Annex.Common +import Common.Annex import Command import CmdLine import Annex.Content diff --git a/Command/Semitrust.hs b/Command/Semitrust.hs index 31b44bc59..53b29c98a 100644 --- a/Command/Semitrust.hs +++ b/Command/Semitrust.hs @@ -7,7 +7,7 @@ module Command.Semitrust where -import Annex.Common +import Common.Annex import Command import qualified Remote import UUID diff --git a/Command/SendKey.hs b/Command/SendKey.hs index f3db99663..ad47cd009 100644 --- a/Command/SendKey.hs +++ b/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 diff --git a/Command/SetKey.hs b/Command/SetKey.hs index dde1ec12a..28bc9a48d 100644 --- a/Command/SetKey.hs +++ b/Command/SetKey.hs @@ -7,7 +7,7 @@ module Command.SetKey where -import Annex.Common +import Common.Annex import Command import LocationLog import Annex.Content diff --git a/Command/Status.hs b/Command/Status.hs index edb74166d..37e13f0d8 100644 --- a/Command/Status.hs +++ b/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 diff --git a/Command/Trust.hs b/Command/Trust.hs index 3c3473e21..bc655e3f6 100644 --- a/Command/Trust.hs +++ b/Command/Trust.hs @@ -7,7 +7,7 @@ module Command.Trust where -import Annex.Common +import Common.Annex import Command import qualified Remote import Trust diff --git a/Command/Unannex.hs b/Command/Unannex.hs index 9413cb88c..d0cef7678 100644 --- a/Command/Unannex.hs +++ b/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 diff --git a/Command/Uninit.hs b/Command/Uninit.hs index c5afe30f2..7b3b4fe32 100644 --- a/Command/Uninit.hs +++ b/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 diff --git a/Command/Unlock.hs b/Command/Unlock.hs index b2e4aa09a..9b568b5a6 100644 --- a/Command/Unlock.hs +++ b/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 diff --git a/Command/Untrust.hs b/Command/Untrust.hs index b8a107d90..bcde0e0a0 100644 --- a/Command/Untrust.hs +++ b/Command/Untrust.hs @@ -7,7 +7,7 @@ module Command.Untrust where -import Annex.Common +import Common.Annex import Command import qualified Remote import UUID diff --git a/Command/Unused.hs b/Command/Unused.hs index 6681fca3c..abf5a5361 100644 --- a/Command/Unused.hs +++ b/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 diff --git a/Command/Upgrade.hs b/Command/Upgrade.hs index 7b6b127a5..90d3a4e95 100644 --- a/Command/Upgrade.hs +++ b/Command/Upgrade.hs @@ -7,7 +7,7 @@ module Command.Upgrade where -import Annex.Common +import Common.Annex import Command import Upgrade import Annex.Version diff --git a/Command/Version.hs b/Command/Version.hs index bc895b194..5ac87099b 100644 --- a/Command/Version.hs +++ b/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 diff --git a/Command/Whereis.hs b/Command/Whereis.hs index fec41f410..0eeb17414 100644 --- a/Command/Whereis.hs +++ b/Command/Whereis.hs @@ -7,7 +7,7 @@ module Command.Whereis where -import Annex.Common +import Common.Annex import LocationLog import Command import Remote diff --git a/Annex/Common.hs b/Common/Annex.hs index ca7b1bff7..43f1ea0af 100644 --- a/Annex/Common.hs +++ b/Common/Annex.hs @@ -1,4 +1,4 @@ -module Annex.Common ( +module Common.Annex ( module Common, module Types, module Annex, @@ -7,7 +7,7 @@ module Config where -import Annex.Common +import Common.Annex import qualified Git import qualified Annex @@ -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 diff --git a/GitAnnex.hs b/GitAnnex.hs index 981488079..3cd7207d3 100644 --- a/GitAnnex.hs +++ b/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 @@ -11,7 +11,7 @@ module Init ( uninitialize ) where -import Annex.Common +import Common.Annex import qualified Git import qualified Annex.Branch import Annex.Version @@ -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 diff --git a/LocationLog.hs b/LocationLog.hs index a633f2637..5cbdbb28a 100644 --- a/LocationLog.hs +++ b/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 diff --git a/Options.hs b/Options.hs index 9f573ef5d..0c7b4d5f4 100644 --- a/Options.hs +++ b/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 diff --git a/PresenceLog.hs b/PresenceLog.hs index 01c1ad094..4e4960f0a 100644 --- a/PresenceLog.hs +++ b/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 { @@ -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 diff --git a/Remote/Bup.hs b/Remote/Bup.hs index 2d0ba4742..986be7fc4 100644 --- a/Remote/Bup.hs +++ b/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 diff --git a/Remote/Directory.hs b/Remote/Directory.hs index bfea850e5..03b17456a 100644 --- a/Remote/Directory.hs +++ b/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 diff --git a/Remote/Git.hs b/Remote/Git.hs index 15e8991f5..704bdc04d 100644 --- a/Remote/Git.hs +++ b/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 diff --git a/Remote/Helper/Encryptable.hs b/Remote/Helper/Encryptable.hs index 6f43b4367..004b70408 100644 --- a/Remote/Helper/Encryptable.hs +++ b/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 diff --git a/Remote/Helper/Special.hs b/Remote/Helper/Special.hs index c4e0b7f07..1fbd7b19e 100644 --- a/Remote/Helper/Special.hs +++ b/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 diff --git a/Remote/Hook.hs b/Remote/Hook.hs index a18bc51e6..cc8ed69ab 100644 --- a/Remote/Hook.hs +++ b/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 diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs index 9b870f2b1..3474f8b25 100644 --- a/Remote/Rsync.hs +++ b/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 diff --git a/Remote/S3real.hs b/Remote/S3real.hs index c846390b8..a75473128 100644 --- a/Remote/S3real.hs +++ b/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 diff --git a/Remote/Web.hs b/Remote/Web.hs index 9132967c7..30a1ff008 100644 --- a/Remote/Web.hs +++ b/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 diff --git a/RemoteLog.hs b/RemoteLog.hs index 4ffe71205..149104fba 100644 --- a/RemoteLog.hs +++ b/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 @@ -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 @@ -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 diff --git a/Upgrade.hs b/Upgrade.hs index 6f1da773d..8b2e939dd 100644 --- a/Upgrade.hs +++ b/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 diff --git a/Upgrade/V0.hs b/Upgrade/V0.hs index af91741a0..b1443fa46 100644 --- a/Upgrade/V0.hs +++ b/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 diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs index f4e44acdc..132e694eb 100644 --- a/Upgrade/V1.hs +++ b/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 diff --git a/Upgrade/V2.hs b/Upgrade/V2.hs index 8ac26dc52..39c7b1561 100644 --- a/Upgrade/V2.hs +++ b/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 diff --git a/git-annex-shell.hs b/git-annex-shell.hs index d03b0910e..2e0d30979 100644 --- a/git-annex-shell.hs +++ b/git-annex-shell.hs @@ -7,7 +7,7 @@ import System.Environment -import Annex.Common +import Common.Annex import qualified Git import CmdLine import Command |