diff options
257 files changed, 191 insertions, 353 deletions
diff --git a/Annex/Action.hs b/Annex/Action.hs index f59c9c2f4..a18ebaf78 100644 --- a/Annex/Action.hs +++ b/Annex/Action.hs @@ -14,7 +14,7 @@ import qualified Data.Map as M import System.Posix.Signals #endif -import Common.Annex +import Annex.Common import qualified Annex import Annex.Content diff --git a/Annex/AutoMerge.hs b/Annex/AutoMerge.hs index 938407890..c9f13f5bf 100644 --- a/Annex/AutoMerge.hs +++ b/Annex/AutoMerge.hs @@ -11,7 +11,7 @@ module Annex.AutoMerge , commitResolvedMerge ) where -import Common.Annex +import Annex.Common import qualified Annex.Queue import Annex.Direct import Annex.CatFile diff --git a/Annex/BloomFilter.hs b/Annex/BloomFilter.hs index 5773a88ee..040363a55 100644 --- a/Annex/BloomFilter.hs +++ b/Annex/BloomFilter.hs @@ -7,7 +7,7 @@ module Annex.BloomFilter where -import Common.Annex +import Annex.Common import qualified Annex import Utility.Bloom diff --git a/Annex/Branch.hs b/Annex/Branch.hs index ad96a2073..6ef778801 100644 --- a/Annex/Branch.hs +++ b/Annex/Branch.hs @@ -32,7 +32,7 @@ import qualified Data.Map as M import Data.Bits.Utils import Control.Concurrent (threadDelay) -import Common.Annex +import Annex.Common import Annex.BranchState import Annex.Journal import Annex.Index diff --git a/Annex/BranchState.hs b/Annex/BranchState.hs index 2885582cd..0550d4224 100644 --- a/Annex/BranchState.hs +++ b/Annex/BranchState.hs @@ -9,7 +9,7 @@ module Annex.BranchState where -import Common.Annex +import Annex.Common import Types.BranchState import qualified Annex diff --git a/Annex/CatFile.hs b/Annex/CatFile.hs index c77a208b8..8de0e536c 100644 --- a/Annex/CatFile.hs +++ b/Annex/CatFile.hs @@ -23,7 +23,7 @@ import qualified Data.ByteString.Lazy as L import qualified Data.Map as M import System.PosixCompat.Types -import Common.Annex +import Annex.Common import qualified Git import qualified Git.CatFile import qualified Annex diff --git a/Annex/CheckAttr.hs b/Annex/CheckAttr.hs index bbe979b3e..28c5ffedd 100644 --- a/Annex/CheckAttr.hs +++ b/Annex/CheckAttr.hs @@ -11,7 +11,7 @@ module Annex.CheckAttr ( checkAttrStop, ) where -import Common.Annex +import Annex.Common import qualified Git.CheckAttr as Git import qualified Annex diff --git a/Annex/CheckIgnore.hs b/Annex/CheckIgnore.hs index 86b46f7c2..824f5feeb 100644 --- a/Annex/CheckIgnore.hs +++ b/Annex/CheckIgnore.hs @@ -12,7 +12,7 @@ module Annex.CheckIgnore ( checkIgnoreStop ) where -import Common.Annex +import Annex.Common import qualified Git.CheckIgnore as Git import qualified Annex diff --git a/Common/Annex.hs b/Annex/Common.hs index 3b8bcdbdd..1f039f135 100644 --- a/Common/Annex.hs +++ b/Annex/Common.hs @@ -1,8 +1,9 @@ -module Common.Annex (module X) where +module Annex.Common (module X) where import Common as X import Types as X -import Types.UUID as X (toUUID, fromUUID) +import Types.Key as X +import Types.UUID as X import Annex as X (gitRepo, inRepo, fromRepo, calcRepo) -import Locations as X +import Annex.Locations as X import Messages as X diff --git a/Annex/Concurrent.hs b/Annex/Concurrent.hs index 787c3e446..d5809df45 100644 --- a/Annex/Concurrent.hs +++ b/Annex/Concurrent.hs @@ -7,7 +7,7 @@ module Annex.Concurrent where -import Common.Annex +import Annex.Common import Annex import Annex.CatFile import Annex.CheckAttr diff --git a/Annex/Content.hs b/Annex/Content.hs index fd0a2742c..103fa264d 100644 --- a/Annex/Content.hs +++ b/Annex/Content.hs @@ -52,7 +52,7 @@ module Annex.Content ( import System.IO.Unsafe (unsafeInterleaveIO) import qualified Data.Set as S -import Common.Annex +import Annex.Common import Logs.Location import Logs.Transfer import qualified Git @@ -62,7 +62,6 @@ import qualified Annex.Branch import Utility.DiskFree import Utility.FileMode import qualified Annex.Url as Url -import Types.Key import Utility.DataUnits import Utility.CopyFile import Utility.Metered @@ -336,12 +335,12 @@ verifyKeyContent v Types.Remote.UnVerified k f = ifM (shouldVerify v) , return True ) where - verifysize = case Types.Key.keySize k of + verifysize = case keySize k of Nothing -> return True Just size -> do size' <- liftIO $ catchDefaultIO 0 $ getFileSize f return (size' == size) - verifycontent = case Types.Backend.verifyKeyContent =<< Backend.maybeLookupBackendName (Types.Key.keyBackendName k) of + verifycontent = case Types.Backend.verifyKeyContent =<< Backend.maybeLookupBackendName (keyBackendName k) of Nothing -> return True Just verifier -> verifier k f diff --git a/Annex/Content/Direct.hs b/Annex/Content/Direct.hs index 3b9d1aea2..2007360e3 100644 --- a/Annex/Content/Direct.hs +++ b/Annex/Content/Direct.hs @@ -29,7 +29,7 @@ module Annex.Content.Direct ( addContentWhenNotPresent, ) where -import Common.Annex +import Annex.Common import Annex.Perms import qualified Git import Utility.Tmp diff --git a/Annex/Difference.hs b/Annex/Difference.hs index e0dc17da7..23448192a 100644 --- a/Annex/Difference.hs +++ b/Annex/Difference.hs @@ -10,7 +10,7 @@ module Annex.Difference ( setDifferences, ) where -import Common.Annex +import Annex.Common import Types.Difference import Logs.Difference import Config diff --git a/Annex/Direct.hs b/Annex/Direct.hs index 8c3d5bb56..e85d8f447 100644 --- a/Annex/Direct.hs +++ b/Annex/Direct.hs @@ -10,7 +10,7 @@ module Annex.Direct where -import Common.Annex +import Annex.Common import qualified Annex import qualified Git import qualified Git.LsFiles diff --git a/Annex/Drop.hs b/Annex/Drop.hs index f02f4f386..8a86c0ba8 100644 --- a/Annex/Drop.hs +++ b/Annex/Drop.hs @@ -7,11 +7,10 @@ module Annex.Drop where -import Common.Annex +import Annex.Common import Logs.Trust import Annex.NumCopies import Types.Remote (uuid) -import Types.Key (key2file) import qualified Remote import qualified Command.Drop import Command diff --git a/Annex/Environment.hs b/Annex/Environment.hs index 13b52aa75..a066e9ab0 100644 --- a/Annex/Environment.hs +++ b/Annex/Environment.hs @@ -9,7 +9,7 @@ module Annex.Environment where -import Common.Annex +import Annex.Common import Utility.UserInfo import qualified Git.Config import Config diff --git a/Annex/FileMatcher.hs b/Annex/FileMatcher.hs index a008198f3..f1936bce9 100644 --- a/Annex/FileMatcher.hs +++ b/Annex/FileMatcher.hs @@ -9,7 +9,7 @@ module Annex.FileMatcher where import qualified Data.Map as M -import Common.Annex +import Annex.Common import Limit import Utility.Matcher import Types.Group diff --git a/Annex/Hook.hs b/Annex/Hook.hs index 1c17e03b4..a073c2598 100644 --- a/Annex/Hook.hs +++ b/Annex/Hook.hs @@ -11,7 +11,7 @@ module Annex.Hook where -import Common.Annex +import Annex.Common import qualified Git.Hook as Git import Config import qualified Annex diff --git a/Annex/Index.hs b/Annex/Index.hs index 60340c50b..ee27ce5f6 100644 --- a/Annex/Index.hs +++ b/Annex/Index.hs @@ -14,7 +14,7 @@ module Annex.Index ( import qualified Control.Exception as E -import Common.Annex +import Annex.Common import Git.Types import qualified Annex import Utility.Env diff --git a/Annex/Ingest.hs b/Annex/Ingest.hs index 70ea105bb..0dd8b5967 100644 --- a/Annex/Ingest.hs +++ b/Annex/Ingest.hs @@ -21,7 +21,7 @@ module Annex.Ingest ( forceParams, ) where -import Common.Annex +import Annex.Common import Types.KeySource import Backend import Annex.Content diff --git a/Annex/Init.hs b/Annex/Init.hs index 9cb876284..ece6e3a31 100644 --- a/Annex/Init.hs +++ b/Annex/Init.hs @@ -16,7 +16,7 @@ module Annex.Init ( probeCrippledFileSystem, ) where -import Common.Annex +import Annex.Common import qualified Annex import qualified Git import qualified Git.LsFiles diff --git a/Annex/InodeSentinal.hs b/Annex/InodeSentinal.hs index 412a7accc..1e763d317 100644 --- a/Annex/InodeSentinal.hs +++ b/Annex/InodeSentinal.hs @@ -9,7 +9,7 @@ module Annex.InodeSentinal where -import Common.Annex +import Annex.Common import qualified Annex import Utility.InodeCache import Annex.Perms diff --git a/Annex/Journal.hs b/Annex/Journal.hs index 148cefbbc..e4faa4865 100644 --- a/Annex/Journal.hs +++ b/Annex/Journal.hs @@ -13,7 +13,7 @@ module Annex.Journal where -import Common.Annex +import Annex.Common import qualified Git import Annex.Perms import Annex.LockFile diff --git a/Annex/Link.hs b/Annex/Link.hs index 7f1a1b14d..7fd0098ef 100644 --- a/Annex/Link.hs +++ b/Annex/Link.hs @@ -14,14 +14,13 @@ module Annex.Link where -import Common.Annex +import Annex.Common import qualified Annex import qualified Git.HashObject import qualified Git.UpdateIndex import qualified Annex.Queue import Git.Types import Git.FilePath -import Types.Key import qualified Data.ByteString.Lazy as L diff --git a/Locations.hs b/Annex/Locations.hs index 564087e1f..322165aee 100644 --- a/Locations.hs +++ b/Annex/Locations.hs @@ -5,7 +5,7 @@ - Licensed under the GNU GPL version 3 or higher. -} -module Locations ( +module Annex.Locations ( keyFile, fileKey, keyPaths, @@ -76,9 +76,9 @@ import Data.Char import Data.Default import Common -import Types.GitConfig import Types.Key import Types.UUID +import Types.GitConfig import Types.Difference import qualified Git import Git.FilePath diff --git a/Annex/LockFile.hs b/Annex/LockFile.hs index 40f9c6b2a..cb1d232b9 100644 --- a/Annex/LockFile.hs +++ b/Annex/LockFile.hs @@ -15,7 +15,7 @@ module Annex.LockFile ( tryExclusiveLock, ) where -import Common.Annex +import Annex.Common import Annex import Types.LockCache import qualified Git diff --git a/Annex/LockPool/PosixOrPid.hs b/Annex/LockPool/PosixOrPid.hs index 58e597f0e..ecf96d51f 100644 --- a/Annex/LockPool/PosixOrPid.hs +++ b/Annex/LockPool/PosixOrPid.hs @@ -20,7 +20,9 @@ module Annex.LockPool.PosixOrPid ( checkSaneLock, ) where -import Common.Annex +import Common +import Types +import Annex.Locations import qualified Annex import qualified Utility.LockPool.Posix as Posix import qualified Utility.LockPool.PidLock as Pid @@ -58,7 +60,7 @@ checkSaneLock f h = H.checkSaneLock f h pidLockFile :: Annex (Maybe FilePath) pidLockFile = ifM (annexPidLock <$> Annex.getGitConfig) - ( Just <$> fromRepo gitAnnexPidLockFile + ( Just <$> Annex.fromRepo gitAnnexPidLockFile , pure Nothing ) diff --git a/Annex/MetaData.hs b/Annex/MetaData.hs index 88415ffde..1f6a484ff 100644 --- a/Annex/MetaData.hs +++ b/Annex/MetaData.hs @@ -11,7 +11,7 @@ module Annex.MetaData ( module X ) where -import Common.Annex +import Annex.Common import qualified Annex import Types.MetaData as X import Annex.MetaData.StandardFields as X diff --git a/Annex/Notification.hs b/Annex/Notification.hs index a7b757e50..691b61dd5 100644 --- a/Annex/Notification.hs +++ b/Annex/Notification.hs @@ -9,7 +9,7 @@ module Annex.Notification (NotifyWitness, notifyTransfer, notifyDrop) where -import Common.Annex +import Annex.Common import Logs.Transfer #ifdef WITH_DBUS_NOTIFICATIONS import qualified Annex diff --git a/Annex/NumCopies.hs b/Annex/NumCopies.hs index 64c78fca0..8653e495a 100644 --- a/Annex/NumCopies.hs +++ b/Annex/NumCopies.hs @@ -22,7 +22,7 @@ module Annex.NumCopies ( UnVerifiedCopy(..), ) where -import Common.Annex +import Annex.Common import qualified Annex import Types.NumCopies import Logs.NumCopies diff --git a/Annex/Perms.hs b/Annex/Perms.hs index 2467c3c77..159cc328a 100644 --- a/Annex/Perms.hs +++ b/Annex/Perms.hs @@ -18,7 +18,7 @@ module Annex.Perms ( withShared, ) where -import Common.Annex +import Annex.Common import Utility.FileMode import Git.SharedRepository import qualified Annex diff --git a/Annex/Queue.hs b/Annex/Queue.hs index d4cab48ca..0e1b0f68c 100644 --- a/Annex/Queue.hs +++ b/Annex/Queue.hs @@ -16,7 +16,7 @@ module Annex.Queue ( mergeFrom, ) where -import Common.Annex +import Annex.Common import Annex hiding (new) import qualified Git.Queue import qualified Git.UpdateIndex diff --git a/Annex/Quvi.hs b/Annex/Quvi.hs index 0355ecd9e..efc63ca9f 100644 --- a/Annex/Quvi.hs +++ b/Annex/Quvi.hs @@ -9,7 +9,7 @@ module Annex.Quvi where -import Common.Annex +import Annex.Common import qualified Annex import Utility.Quvi import Utility.Url diff --git a/Annex/ReplaceFile.hs b/Annex/ReplaceFile.hs index f8c1d97a9..4b1b2b5db 100644 --- a/Annex/ReplaceFile.hs +++ b/Annex/ReplaceFile.hs @@ -7,7 +7,7 @@ module Annex.ReplaceFile where -import Common.Annex +import Annex.Common import Annex.Perms import Utility.Tmp diff --git a/Annex/SpecialRemote.hs b/Annex/SpecialRemote.hs index 3892eea2f..8a2345830 100644 --- a/Annex/SpecialRemote.hs +++ b/Annex/SpecialRemote.hs @@ -7,7 +7,7 @@ module Annex.SpecialRemote where -import Common.Annex +import Annex.Common import Remote (remoteTypes, remoteMap) import Types.Remote (RemoteConfig, RemoteConfigKey, typename, setup) import Logs.Remote diff --git a/Annex/Ssh.hs b/Annex/Ssh.hs index c9325bb7d..5c6a9dcea 100644 --- a/Annex/Ssh.hs +++ b/Annex/Ssh.hs @@ -24,7 +24,7 @@ import qualified Data.Map as M import Data.Hash.MD5 import System.Exit -import Common.Annex +import Annex.Common import Annex.LockFile import qualified Build.SysConfig as SysConfig import qualified Annex diff --git a/Annex/TaggedPush.hs b/Annex/TaggedPush.hs index eff8d6e0e..ef1aeeea2 100644 --- a/Annex/TaggedPush.hs +++ b/Annex/TaggedPush.hs @@ -7,7 +7,7 @@ module Annex.TaggedPush where -import Common.Annex +import Annex.Common import qualified Remote import qualified Annex.Branch import qualified Git diff --git a/Annex/Transfer.hs b/Annex/Transfer.hs index fe428e21a..805446b75 100644 --- a/Annex/Transfer.hs +++ b/Annex/Transfer.hs @@ -18,7 +18,7 @@ module Annex.Transfer ( forwardRetry, ) where -import Common.Annex +import Annex.Common import Logs.Transfer as X import Annex.Notification as X import Annex.Perms diff --git a/Annex/UUID.hs b/Annex/UUID.hs index cdd06c9e6..69d4ab6c4 100644 --- a/Annex/UUID.hs +++ b/Annex/UUID.hs @@ -28,7 +28,7 @@ module Annex.UUID ( bitTorrentUUID, ) where -import Common.Annex +import Annex.Common import qualified Git import qualified Git.Config import Config diff --git a/Annex/Url.hs b/Annex/Url.hs index b1a932e62..b787ee78c 100644 --- a/Annex/Url.hs +++ b/Annex/Url.hs @@ -13,7 +13,7 @@ module Annex.Url ( getUserAgent, ) where -import Common.Annex +import Annex.Common import qualified Annex import Utility.Url as U import qualified Build.SysConfig as SysConfig diff --git a/Annex/VariantFile.hs b/Annex/VariantFile.hs index 89cfbc16a..9bf027b5c 100644 --- a/Annex/VariantFile.hs +++ b/Annex/VariantFile.hs @@ -7,8 +7,7 @@ module Annex.VariantFile where -import Common.Annex -import Types.Key +import Annex.Common import Data.Hash.MD5 diff --git a/Annex/Version.hs b/Annex/Version.hs index b54fb68e0..f294f8cd3 100644 --- a/Annex/Version.hs +++ b/Annex/Version.hs @@ -9,7 +9,7 @@ module Annex.Version where -import Common.Annex +import Annex.Common import Config import qualified Annex diff --git a/Annex/View.hs b/Annex/View.hs index 060301fd5..14c3eccad 100644 --- a/Annex/View.hs +++ b/Annex/View.hs @@ -7,7 +7,7 @@ module Annex.View where -import Common.Annex +import Annex.Common import Annex.View.ViewedFile import Types.View import Types.MetaData diff --git a/Annex/View/ViewedFile.hs b/Annex/View/ViewedFile.hs index 0acba235a..4bd11f756 100644 --- a/Annex/View/ViewedFile.hs +++ b/Annex/View/ViewedFile.hs @@ -16,7 +16,7 @@ module Annex.View.ViewedFile ( prop_viewedFile_roundtrips, ) where -import Common.Annex +import Annex.Common type FileName = String type ViewedFile = FileName diff --git a/Annex/Wanted.hs b/Annex/Wanted.hs index ba7df0a9c..d226483a1 100644 --- a/Annex/Wanted.hs +++ b/Annex/Wanted.hs @@ -7,7 +7,7 @@ module Annex.Wanted where -import Common.Annex +import Annex.Common import Logs.PreferredContent import Annex.UUID diff --git a/Annex/WorkTree.hs b/Annex/WorkTree.hs index 85ea9a62e..b2c8cb7f3 100644 --- a/Annex/WorkTree.hs +++ b/Annex/WorkTree.hs @@ -7,7 +7,7 @@ module Annex.WorkTree where -import Common.Annex +import Annex.Common import Annex.Link import Annex.CatFile import Annex.Version diff --git a/Assistant/Alert.hs b/Assistant/Alert.hs index 1286e4590..265828dbb 100644 --- a/Assistant/Alert.hs +++ b/Assistant/Alert.hs @@ -9,7 +9,7 @@ module Assistant.Alert where -import Common.Annex +import Annex.Common import Assistant.Types.Alert import Assistant.Alert.Utility import qualified Remote diff --git a/Assistant/Alert/Utility.hs b/Assistant/Alert/Utility.hs index 65484e0e6..5a6c73b85 100644 --- a/Assistant/Alert/Utility.hs +++ b/Assistant/Alert/Utility.hs @@ -7,7 +7,7 @@ module Assistant.Alert.Utility where -import Common.Annex +import Annex.Common import Assistant.Types.Alert import Utility.Tense diff --git a/Assistant/Common.hs b/Assistant/Common.hs index 5fab84290..d26d2b07a 100644 --- a/Assistant/Common.hs +++ b/Assistant/Common.hs @@ -7,7 +7,7 @@ module Assistant.Common (module X) where -import Common.Annex as X +import Annex.Common as X import Assistant.Monad as X import Assistant.Types.DaemonStatus as X import Assistant.Types.NamedThread as X diff --git a/Assistant/Monad.hs b/Assistant/Monad.hs index a34264a01..5662209c9 100644 --- a/Assistant/Monad.hs +++ b/Assistant/Monad.hs @@ -28,7 +28,7 @@ module Assistant.Monad ( import "mtl" Control.Monad.Reader import System.Log.Logger -import Common.Annex +import Annex.Common import Assistant.Types.ThreadedMonad import Assistant.Types.DaemonStatus import Assistant.Types.ScanRemotes diff --git a/Assistant/NamedThread.hs b/Assistant/NamedThread.hs index f80953053..7acb70132 100644 --- a/Assistant/NamedThread.hs +++ b/Assistant/NamedThread.hs @@ -9,7 +9,7 @@ module Assistant.NamedThread where -import Common.Annex +import Annex.Common import Assistant.Types.NamedThread import Assistant.Types.ThreadName import Assistant.Types.DaemonStatus diff --git a/Assistant/Pairing.hs b/Assistant/Pairing.hs index 2390379e2..34c5aab1f 100644 --- a/Assistant/Pairing.hs +++ b/Assistant/Pairing.hs @@ -9,7 +9,7 @@ module Assistant.Pairing where -import Common.Annex +import Annex.Common import Utility.Verifiable import Assistant.Ssh diff --git a/Assistant/Ssh.hs b/Assistant/Ssh.hs index 80fb5c19a..fb82586b8 100644 --- a/Assistant/Ssh.hs +++ b/Assistant/Ssh.hs @@ -7,7 +7,7 @@ module Assistant.Ssh where -import Common.Annex +import Annex.Common import Utility.Tmp import Utility.Shell import Utility.Rsync diff --git a/Assistant/Threads/SanityChecker.hs b/Assistant/Threads/SanityChecker.hs index f42462e52..a4f037f5a 100644 --- a/Assistant/Threads/SanityChecker.hs +++ b/Assistant/Threads/SanityChecker.hs @@ -40,7 +40,6 @@ import Assistant.Unused import Logs.Unused import Logs.Transfer import Annex.Path -import Types.Key (keyBackendName) import qualified Annex #ifdef WITH_WEBAPP import Assistant.WebApp.Types diff --git a/Assistant/Types/Buddies.hs b/Assistant/Types/Buddies.hs index 2887aaef0..432440d2e 100644 --- a/Assistant/Types/Buddies.hs +++ b/Assistant/Types/Buddies.hs @@ -9,7 +9,7 @@ module Assistant.Types.Buddies where -import Common.Annex +import Annex.Common import qualified Data.Map as M import Control.Concurrent.STM diff --git a/Assistant/Types/DaemonStatus.hs b/Assistant/Types/DaemonStatus.hs index e1b6c997e..d9259843b 100644 --- a/Assistant/Types/DaemonStatus.hs +++ b/Assistant/Types/DaemonStatus.hs @@ -7,7 +7,7 @@ module Assistant.Types.DaemonStatus where -import Common.Annex +import Annex.Common import Assistant.Pairing import Utility.NotificationBroadcaster import Logs.Transfer diff --git a/Assistant/Types/NetMessager.hs b/Assistant/Types/NetMessager.hs index 475d810ae..da6682233 100644 --- a/Assistant/Types/NetMessager.hs +++ b/Assistant/Types/NetMessager.hs @@ -7,7 +7,7 @@ module Assistant.Types.NetMessager where -import Common.Annex +import Annex.Common import Assistant.Pairing import Git.Types diff --git a/Assistant/Types/Pushes.hs b/Assistant/Types/Pushes.hs index 0da8b44b5..ff860a0c1 100644 --- a/Assistant/Types/Pushes.hs +++ b/Assistant/Types/Pushes.hs @@ -7,7 +7,7 @@ module Assistant.Types.Pushes where -import Common.Annex +import Annex.Common import Control.Concurrent.STM import Data.Time.Clock diff --git a/Assistant/Types/ScanRemotes.hs b/Assistant/Types/ScanRemotes.hs index ac6d8fef9..84a9ee659 100644 --- a/Assistant/Types/ScanRemotes.hs +++ b/Assistant/Types/ScanRemotes.hs @@ -7,7 +7,7 @@ module Assistant.Types.ScanRemotes where -import Common.Annex +import Annex.Common import Control.Concurrent.STM import qualified Data.Map as M diff --git a/Assistant/Types/ThreadedMonad.hs b/Assistant/Types/ThreadedMonad.hs index eadf325ea..ccb35d023 100644 --- a/Assistant/Types/ThreadedMonad.hs +++ b/Assistant/Types/ThreadedMonad.hs @@ -7,7 +7,7 @@ module Assistant.Types.ThreadedMonad where -import Common.Annex +import Annex.Common import qualified Annex import Control.Concurrent diff --git a/Assistant/Types/TransferQueue.hs b/Assistant/Types/TransferQueue.hs index 73a7521c5..ee9409a4b 100644 --- a/Assistant/Types/TransferQueue.hs +++ b/Assistant/Types/TransferQueue.hs @@ -7,7 +7,7 @@ module Assistant.Types.TransferQueue where -import Common.Annex +import Annex.Common import Logs.Transfer import Control.Concurrent.STM diff --git a/Assistant/Types/TransferrerPool.hs b/Assistant/Types/TransferrerPool.hs index 697bb8dd5..a2425eb62 100644 --- a/Assistant/Types/TransferrerPool.hs +++ b/Assistant/Types/TransferrerPool.hs @@ -7,7 +7,7 @@ module Assistant.Types.TransferrerPool where -import Common.Annex +import Annex.Common import Utility.NotificationBroadcaster import Assistant.Types.DaemonStatus diff --git a/Assistant/Unused.hs b/Assistant/Unused.hs index 55a04c597..26d59cf69 100644 --- a/Assistant/Unused.hs +++ b/Assistant/Unused.hs @@ -13,7 +13,6 @@ import qualified Data.Map as M import Assistant.Common import qualified Git -import Types.Key import Logs.Unused import Logs.Location import Annex.Content diff --git a/Assistant/XMPP/Buddies.hs b/Assistant/XMPP/Buddies.hs index 29e0e24cf..77eb3202f 100644 --- a/Assistant/XMPP/Buddies.hs +++ b/Assistant/XMPP/Buddies.hs @@ -8,7 +8,7 @@ module Assistant.XMPP.Buddies where import Assistant.XMPP -import Common.Annex +import Annex.Common import Assistant.Types.Buddies import Network.Protocol.XMPP diff --git a/Backend.hs b/Backend.hs index c2f3d28d4..f7bbed6b5 100644 --- a/Backend.hs +++ b/Backend.hs @@ -16,10 +16,9 @@ module Backend ( isStableKey, ) where -import Common.Annex +import Annex.Common import qualified Annex import Annex.CheckAttr -import Types.Key import Types.KeySource import qualified Types.Backend as B diff --git a/Backend/Hash.hs b/Backend/Hash.hs index 77e964bad..363467a2a 100644 --- a/Backend/Hash.hs +++ b/Backend/Hash.hs @@ -12,10 +12,9 @@ module Backend.Hash ( testKeyBackend, ) where -import Common.Annex +import Annex.Common import qualified Annex import Types.Backend -import Types.Key import Types.KeySource import Utility.Hash import Utility.ExternalSHA diff --git a/Backend/URL.hs b/Backend/URL.hs index 4279ebd83..92b7a4482 100644 --- a/Backend/URL.hs +++ b/Backend/URL.hs @@ -10,9 +10,8 @@ module Backend.URL ( fromUrl ) where -import Common.Annex +import Annex.Common import Types.Backend -import Types.Key import Backend.Utilities backends :: [Backend] diff --git a/Backend/Utilities.hs b/Backend/Utilities.hs index 4c1f70eda..04221650b 100644 --- a/Backend/Utilities.hs +++ b/Backend/Utilities.hs @@ -9,7 +9,7 @@ module Backend.Utilities where import Data.Hash.MD5 -import Common.Annex +import Annex.Common {- Generates a keyName from an input string. Takes care of sanitizing it. - If it's not too long, the full string is used as the keyName. diff --git a/Backend/WORM.hs b/Backend/WORM.hs index e1dbae2cb..99a853f47 100644 --- a/Backend/WORM.hs +++ b/Backend/WORM.hs @@ -7,9 +7,8 @@ module Backend.WORM (backends) where -import Common.Annex +import Annex.Common import Types.Backend -import Types.Key import Types.KeySource import Backend.Utilities import Git.FilePath diff --git a/Build/DistributionUpdate.hs b/Build/DistributionUpdate.hs index beb14b0b6..cdebc99e0 100644 --- a/Build/DistributionUpdate.hs +++ b/Build/DistributionUpdate.hs @@ -8,7 +8,7 @@ - Also gpg signs the files. -} -import Common.Annex +import Annex.Common import Types.Distribution import Build.Version (getChangelogVersion, Version) import Utility.UserInfo @@ -10,7 +10,7 @@ module Checks where -import Common.Annex +import Annex.Common import Types.Command import Annex.Init import Config diff --git a/CmdLine.hs b/CmdLine.hs index bc0f86524..1c9ee7f90 100644 --- a/CmdLine.hs +++ b/CmdLine.hs @@ -15,7 +15,7 @@ import qualified Options.Applicative.Help as H import qualified Control.Exception as E import Control.Exception (throw) -import Common.Annex +import Annex.Common import qualified Annex import qualified Git import qualified Git.AutoCorrect diff --git a/CmdLine/Action.hs b/CmdLine/Action.hs index b9fbf166e..ec31c32f0 100644 --- a/CmdLine/Action.hs +++ b/CmdLine/Action.hs @@ -9,7 +9,7 @@ module CmdLine.Action where -import Common.Annex +import Annex.Common import qualified Annex import Annex.Concurrent import Types.Command diff --git a/CmdLine/Batch.hs b/CmdLine/Batch.hs index 0cbd3781d..cca93b0b3 100644 --- a/CmdLine/Batch.hs +++ b/CmdLine/Batch.hs @@ -7,8 +7,11 @@ module CmdLine.Batch where -import Common.Annex -import Command +import Annex.Common +import Types.Command +import CmdLine.Action +import CmdLine.GitAnnex.Options +import Options.Applicative data BatchMode = Batch | NoBatch diff --git a/CmdLine/GitAnnex/Options.hs b/CmdLine/GitAnnex/Options.hs index 7d8bcadee..81d6434e0 100644 --- a/CmdLine/GitAnnex/Options.hs +++ b/CmdLine/GitAnnex/Options.hs @@ -11,14 +11,13 @@ import Options.Applicative import Options.Applicative.Builder.Internal import Control.Concurrent -import Common.Annex +import Annex.Common import qualified Git.Config import qualified Git.Construct import Git.Types import Types.TrustLevel import Types.NumCopies import Types.Messages -import Types.Key import Types.Command import Types.DeferredParse import Types.DesktopNotify diff --git a/CmdLine/GitAnnexShell.hs b/CmdLine/GitAnnexShell.hs index 09108f879..599d12fec 100644 --- a/CmdLine/GitAnnexShell.hs +++ b/CmdLine/GitAnnexShell.hs @@ -7,7 +7,7 @@ module CmdLine.GitAnnexShell where -import Common.Annex +import Annex.Common import qualified Git.Construct import qualified Git.Config import CmdLine diff --git a/CmdLine/GitAnnexShell/Checks.hs b/CmdLine/GitAnnexShell/Checks.hs index 5513d69cd..63d2e594f 100644 --- a/CmdLine/GitAnnexShell/Checks.hs +++ b/CmdLine/GitAnnexShell/Checks.hs @@ -7,7 +7,7 @@ module CmdLine.GitAnnexShell.Checks where -import Common.Annex +import Annex.Common import Command import qualified Annex import Annex.Init diff --git a/CmdLine/GitAnnexShell/Fields.hs b/CmdLine/GitAnnexShell/Fields.hs index 1b76fc766..efe22971d 100644 --- a/CmdLine/GitAnnexShell/Fields.hs +++ b/CmdLine/GitAnnexShell/Fields.hs @@ -7,7 +7,7 @@ module CmdLine.GitAnnexShell.Fields where -import Common.Annex +import Annex.Common import qualified Annex import Git.FilePath diff --git a/CmdLine/Option.hs b/CmdLine/Option.hs index 4e201cbd4..b0fec3f09 100644 --- a/CmdLine/Option.hs +++ b/CmdLine/Option.hs @@ -9,7 +9,7 @@ module CmdLine.Option where import Options.Applicative -import Common.Annex +import Annex.Common import CmdLine.Usage import CmdLine.GlobalSetter import qualified Annex diff --git a/CmdLine/Seek.hs b/CmdLine/Seek.hs index be2bd22c3..30d47599a 100644 --- a/CmdLine/Seek.hs +++ b/CmdLine/Seek.hs @@ -11,9 +11,8 @@ module CmdLine.Seek where -import Common.Annex +import Annex.Common import Types.Command -import Types.Key import Types.FileMatcher import qualified Annex import qualified Git diff --git a/CmdLine/Usage.hs b/CmdLine/Usage.hs index a6cc90a71..f66eb9153 100644 --- a/CmdLine/Usage.hs +++ b/CmdLine/Usage.hs @@ -7,7 +7,7 @@ module CmdLine.Usage where -import Common.Annex +import Annex.Common import Types.Command usageMessage :: String -> String diff --git a/Command.hs b/Command.hs index e8c434b9b..3726e4777 100644 --- a/Command.hs +++ b/Command.hs @@ -23,19 +23,19 @@ module Command ( module ReExported ) where -import Common.Annex +import Annex.Common as ReExported import Annex.WorkTree import qualified Git import Types.Command as ReExported -import Types.Option as ReExported import Types.DeferredParse as ReExported -import CmdLine.Seek as ReExported import Checks as ReExported +import CmdLine.Seek as ReExported import CmdLine.Usage as ReExported import CmdLine.Action as ReExported import CmdLine.Option as ReExported import CmdLine.GlobalSetter as ReExported import CmdLine.GitAnnex.Options as ReExported +import CmdLine.Batch as ReExported import Options.Applicative as ReExported hiding (command) import qualified Options.Applicative as O diff --git a/Command/Add.hs b/Command/Add.hs index e85cdd6c1..23c9318fd 100644 --- a/Command/Add.hs +++ b/Command/Add.hs @@ -7,7 +7,6 @@ module Command.Add where -import Common.Annex import Command import Annex.Ingest import Logs.Location @@ -16,13 +15,11 @@ import Annex.Content.Direct import Annex.Link import qualified Annex import qualified Annex.Queue +import qualified Database.Keys import Config import Utility.InodeCache import Annex.FileMatcher import Annex.Version -import qualified Database.Keys -import Types.Key -import CmdLine.Batch cmd :: Command cmd = notBareRepo $ withGlobalOptions (jobsOption : jsonOption : fileMatchingOptions) $ diff --git a/Command/AddUnused.hs b/Command/AddUnused.hs index 57fd0cf38..7a9a1ba30 100644 --- a/Command/AddUnused.hs +++ b/Command/AddUnused.hs @@ -7,12 +7,10 @@ module Command.AddUnused where -import Common.Annex import Logs.Location import Command import Annex.Ingest import Command.Unused (withUnusedMaps, UnusedMaps(..), startUnused) -import Types.Key cmd :: Command cmd = notDirect $ diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs index 7d7796ba5..d42d6fb46 100644 --- a/Command/AddUrl.hs +++ b/Command/AddUrl.hs @@ -11,7 +11,6 @@ module Command.AddUrl where import Network.URI -import Common.Annex import Command import Backend import qualified Annex @@ -25,7 +24,6 @@ import Annex.Content import Annex.Ingest import Annex.UUID import Logs.Web -import Types.Key import Types.KeySource import Types.UrlContents import Config @@ -33,7 +31,6 @@ import Annex.Content.Direct import Annex.FileMatcher import Logs.Location import Utility.Metered -import CmdLine.Batch import qualified Annex.Transfer as Transfer #ifdef WITH_QUVI import Annex.Quvi diff --git a/Command/Assistant.hs b/Command/Assistant.hs index 836be7b67..690f36f19 100644 --- a/Command/Assistant.hs +++ b/Command/Assistant.hs @@ -7,7 +7,6 @@ module Command.Assistant where -import Common.Annex import Command import qualified Command.Watch import Annex.Init diff --git a/Command/CheckPresentKey.hs b/Command/CheckPresentKey.hs index 6a38f8501..e8dabe18f 100644 --- a/Command/CheckPresentKey.hs +++ b/Command/CheckPresentKey.hs @@ -7,9 +7,7 @@ module Command.CheckPresentKey where -import Common.Annex import Command -import Types.Key import qualified Remote import Annex import Types.Messages diff --git a/Command/Commit.hs b/Command/Commit.hs index 52b88d2b3..131169e68 100644 --- a/Command/Commit.hs +++ b/Command/Commit.hs @@ -7,7 +7,6 @@ module Command.Commit where -import Common.Annex import Command import qualified Annex.Branch import qualified Git diff --git a/Command/ConfigList.hs b/Command/ConfigList.hs index 997016e8e..383117e52 100644 --- a/Command/ConfigList.hs +++ b/Command/ConfigList.hs @@ -7,7 +7,6 @@ module Command.ConfigList where -import Common.Annex import Command import Annex.UUID import Annex.Init diff --git a/Command/ContentLocation.hs b/Command/ContentLocation.hs index d228636f6..7cd6c2995 100644 --- a/Command/ContentLocation.hs +++ b/Command/ContentLocation.hs @@ -7,11 +7,8 @@ module Command.ContentLocation where -import Common.Annex import Command -import CmdLine.Batch import Annex.Content -import Types.Key cmd :: Command cmd = noCommit $ diff --git a/Command/Copy.hs b/Command/Copy.hs index 1fe31e36e..f48f579ef 100644 --- a/Command/Copy.hs +++ b/Command/Copy.hs @@ -7,7 +7,6 @@ module Command.Copy where -import Common.Annex import Command import qualified Command.Move import qualified Remote diff --git a/Command/Dead.hs b/Command/Dead.hs index 04c754d07..ecbe41293 100644 --- a/Command/Dead.hs +++ b/Command/Dead.hs @@ -8,9 +8,7 @@ module Command.Dead where import Command -import Common.Annex import Types.TrustLevel -import Types.Key import Command.Trust (trustCommand) import Logs.Location import Remote (keyLocations) diff --git a/Command/Describe.hs b/Command/Describe.hs index ca0bac4e8..8872244f0 100644 --- a/Command/Describe.hs +++ b/Command/Describe.hs @@ -7,7 +7,6 @@ module Command.Describe where -import Common.Annex import Command import qualified Remote import Logs.UUID diff --git a/Command/DiffDriver.hs b/Command/DiffDriver.hs index 2313e5f0d..2c9b4a39d 100644 --- a/Command/DiffDriver.hs +++ b/Command/DiffDriver.hs @@ -7,7 +7,6 @@ module Command.DiffDriver where -import Common.Annex import Command import Annex.Content import Annex.Link diff --git a/Command/Direct.hs b/Command/Direct.hs index 9cfd258eb..32d63f059 100644 --- a/Command/Direct.hs +++ b/Command/Direct.hs @@ -7,7 +7,6 @@ module Command.Direct where -import Common.Annex import Command import qualified Git import qualified Git.LsFiles diff --git a/Command/Drop.hs b/Command/Drop.hs index b26a4842a..3513caba9 100644 --- a/Command/Drop.hs +++ b/Command/Drop.hs @@ -7,7 +7,6 @@ module Command.Drop where -import Common.Annex import Command import qualified Remote import qualified Annex diff --git a/Command/DropKey.hs b/Command/DropKey.hs index 3dea4b4b7..60d7d5fc7 100644 --- a/Command/DropKey.hs +++ b/Command/DropKey.hs @@ -7,7 +7,6 @@ module Command.DropKey where -import Common.Annex import Command import qualified Annex import Logs.Location diff --git a/Command/DropUnused.hs b/Command/DropUnused.hs index d9f02a370..edc11ea45 100644 --- a/Command/DropUnused.hs +++ b/Command/DropUnused.hs @@ -7,7 +7,6 @@ module Command.DropUnused where -import Common.Annex import Command import qualified Command.Drop import qualified Remote diff --git a/Command/EnableRemote.hs b/Command/EnableRemote.hs index b3ba451c2..182527095 100644 --- a/Command/EnableRemote.hs +++ b/Command/EnableRemote.hs @@ -7,7 +7,6 @@ module Command.EnableRemote where -import Common.Annex import Command import qualified Logs.Remote import qualified Types.Remote as R diff --git a/Command/ExamineKey.hs b/Command/ExamineKey.hs index 9c59697f3..1ca1f9fb5 100644 --- a/Command/ExamineKey.hs +++ b/Command/ExamineKey.hs @@ -7,12 +7,9 @@ module Command.ExamineKey where -import Common.Annex import Command -import CmdLine.Batch import qualified Utility.Format import Command.Find (parseFormatOption, showFormatted, keyVars) -import Types.Key cmd :: Command cmd = noCommit $ withGlobalOptions [jsonOption] $ diff --git a/Command/Expire.hs b/Command/Expire.hs index 1e67d1d2a..fafee4506 100644 --- a/Command/Expire.hs +++ b/Command/Expire.hs @@ -7,7 +7,6 @@ module Command.Expire where -import Common.Annex import Command import Logs.Activity import Logs.UUID diff --git a/Command/Find.hs b/Command/Find.hs index c720ce76c..08c720575 100644 --- a/Command/Find.hs +++ b/Command/Find.hs @@ -10,14 +10,11 @@ module Command.Find where import Data.Default import qualified Data.Map as M -import Common.Annex import Command import Annex.Content import Limit import qualified Utility.Format import Utility.DataUnits -import Types.Key -import CmdLine.Batch cmd :: Command cmd = withGlobalOptions annexedMatchingOptions $ mkCommand $ diff --git a/Command/FindRef.hs b/Command/FindRef.hs index 8de7d9e59..cb14371e0 100644 --- a/Command/FindRef.hs +++ b/Command/FindRef.hs @@ -7,7 +7,6 @@ module Command.FindRef where -import Common.Annex import Command import qualified Command.Find as Find diff --git a/Command/Fix.hs b/Command/Fix.hs index e63cebf42..5565a6837 100644 --- a/Command/Fix.hs +++ b/Command/Fix.hs @@ -9,7 +9,6 @@ module Command.Fix where -import Common.Annex import Command import Config import qualified Annex diff --git a/Command/Forget.hs b/Command/Forget.hs index 584b56f8a..583eee7ca 100644 --- a/Command/Forget.hs +++ b/Command/Forget.hs @@ -7,7 +7,6 @@ module Command.Forget where -import Common.Annex import Command import qualified Annex.Branch as Branch import Logs.Transitions diff --git a/Command/FromKey.hs b/Command/FromKey.hs index 6a3fe3a4a..36cc1d31f 100644 --- a/Command/FromKey.hs +++ b/Command/FromKey.hs @@ -9,11 +9,9 @@ module Command.FromKey where -import Common.Annex import Command import qualified Annex.Queue import Annex.Content -import Types.Key import qualified Annex import qualified Backend.URL diff --git a/Command/Fsck.hs b/Command/Fsck.hs index 3abf55aa3..08892e37f 100644 --- a/Command/Fsck.hs +++ b/Command/Fsck.hs @@ -9,12 +9,10 @@ module Command.Fsck where -import Common.Annex import Command import qualified Annex import qualified Remote import qualified Types.Backend -import qualified Types.Key import qualified Backend import Annex.Content import Annex.Content.Direct @@ -29,7 +27,6 @@ import Annex.NumCopies import Annex.UUID import Utility.DataUnits import Config -import Types.Key import Utility.HumanTime import Utility.CopyFile import Git.FilePath @@ -177,7 +174,7 @@ performRemote key file backend numcopies remote = startKey :: Incremental -> Key -> NumCopies -> CommandStart startKey inc key numcopies = - case Backend.maybeLookupBackendName (Types.Key.keyBackendName key) of + case Backend.maybeLookupBackendName (keyBackendName key) of Nothing -> stop Just backend -> runFsck inc (key2file key) key $ performKey key backend numcopies @@ -309,7 +306,7 @@ checkKeySizeRemote key remote (Just file) = checkKeySizeOr (badContentRemote remote file) key file checkKeySizeOr :: (Key -> Annex String) -> Key -> FilePath -> Annex Bool -checkKeySizeOr bad key file = case Types.Key.keySize key of +checkKeySizeOr bad key file = case keySize key of Nothing -> return True Just size -> do size' <- liftIO $ getFileSize file diff --git a/Command/FuzzTest.hs b/Command/FuzzTest.hs index fd888e0df..4aed02d46 100644 --- a/Command/FuzzTest.hs +++ b/Command/FuzzTest.hs @@ -7,9 +7,8 @@ module Command.FuzzTest where -import Common.Annex -import qualified Annex import Command +import qualified Annex import qualified Git.Config import Config import Utility.ThreadScheduler diff --git a/Command/GCryptSetup.hs b/Command/GCryptSetup.hs index 5c2686635..f2943ea13 100644 --- a/Command/GCryptSetup.hs +++ b/Command/GCryptSetup.hs @@ -7,7 +7,6 @@ module Command.GCryptSetup where -import Common.Annex import Command import Annex.UUID import qualified Remote.GCrypt diff --git a/Command/Get.hs b/Command/Get.hs index 07a501072..f49d202e1 100644 --- a/Command/Get.hs +++ b/Command/Get.hs @@ -7,7 +7,6 @@ module Command.Get where -import Common.Annex import Command import qualified Remote import Annex.Content diff --git a/Command/Group.hs b/Command/Group.hs index 6543fa2fb..8e901dfb3 100644 --- a/Command/Group.hs +++ b/Command/Group.hs @@ -7,7 +7,6 @@ module Command.Group where -import Common.Annex import Command import qualified Remote import Logs.Group diff --git a/Command/GroupWanted.hs b/Command/GroupWanted.hs index 0565344b1..6a9e300bf 100644 --- a/Command/GroupWanted.hs +++ b/Command/GroupWanted.hs @@ -7,7 +7,6 @@ module Command.GroupWanted where -import Common.Annex import Command import Logs.PreferredContent import Command.Wanted (performGet, performSet) diff --git a/Command/Help.hs b/Command/Help.hs index a44dcb234..419d1ea42 100644 --- a/Command/Help.hs +++ b/Command/Help.hs @@ -7,7 +7,6 @@ module Command.Help where -import Common.Annex import Command import qualified Command.Init import qualified Command.Add diff --git a/Command/Import.hs b/Command/Import.hs index 4e9ff69dc..847841930 100644 --- a/Command/Import.hs +++ b/Command/Import.hs @@ -7,7 +7,6 @@ module Command.Import where -import Common.Annex import Command import qualified Git import qualified Annex @@ -16,7 +15,6 @@ import Utility.CopyFile import Backend import Remote import Types.KeySource -import Types.Key import Annex.CheckIgnore import Annex.NumCopies import Types.FileMatcher diff --git a/Command/ImportFeed.hs b/Command/ImportFeed.hs index 2db6e608a..6abb3f694 100644 --- a/Command/ImportFeed.hs +++ b/Command/ImportFeed.hs @@ -20,9 +20,8 @@ import Data.Time.Format import System.Locale #endif -import Common.Annex -import qualified Annex import Command +import qualified Annex import qualified Annex.Url as Url import qualified Remote import qualified Types.Remote as Remote diff --git a/Command/InAnnex.hs b/Command/InAnnex.hs index c00f18ead..682f32aef 100644 --- a/Command/InAnnex.hs +++ b/Command/InAnnex.hs @@ -7,7 +7,6 @@ module Command.InAnnex where -import Common.Annex import Command import Annex.Content diff --git a/Command/Indirect.hs b/Command/Indirect.hs index 06897e292..74841a5f6 100644 --- a/Command/Indirect.hs +++ b/Command/Indirect.hs @@ -7,7 +7,6 @@ module Command.Indirect where -import Common.Annex import Command import qualified Git import qualified Git.Branch diff --git a/Command/Info.hs b/Command/Info.hs index 144f499e5..ede61a369 100644 --- a/Command/Info.hs +++ b/Command/Info.hs @@ -14,16 +14,14 @@ import qualified Data.Map.Strict as M import Text.JSON import Data.Ord -import Common.Annex +import Command import qualified Git import qualified Annex import qualified Remote import qualified Types.Remote as Remote -import Command import Utility.DataUnits import Utility.DiskFree import Annex.Content -import Types.Key import Logs.UUID import Logs.Trust import Logs.Location @@ -38,7 +36,6 @@ import qualified Limit import Messages.JSON (DualDisp(..)) import Annex.BloomFilter import qualified Command.Unused -import CmdLine.Batch -- a named computation that produces a statistic type Stat = StatState (Maybe (String, StatState String)) diff --git a/Command/Init.hs b/Command/Init.hs index 94d8168a6..3c38c0f8a 100644 --- a/Command/Init.hs +++ b/Command/Init.hs @@ -7,7 +7,6 @@ module Command.Init where -import Common.Annex import Command import Annex.Init import Annex.Version diff --git a/Command/InitRemote.hs b/Command/InitRemote.hs index 60b5220e5..1f3d63dbd 100644 --- a/Command/InitRemote.hs +++ b/Command/InitRemote.hs @@ -9,9 +9,8 @@ module Command.InitRemote where import qualified Data.Map as M -import Common.Annex -import Annex.SpecialRemote import Command +import Annex.SpecialRemote import qualified Remote import qualified Logs.Remote import qualified Types.Remote as R diff --git a/Command/List.hs b/Command/List.hs index c912e8c3f..786db7b79 100644 --- a/Command/List.hs +++ b/Command/List.hs @@ -14,7 +14,6 @@ import Data.Function import Data.Tuple.Utils import Data.Ord -import Common.Annex import Command import Remote import Logs.Trust diff --git a/Command/Lock.hs b/Command/Lock.hs index 4e42a8d76..9611d2407 100644 --- a/Command/Lock.hs +++ b/Command/Lock.hs @@ -7,7 +7,6 @@ module Command.Lock where -import Common.Annex import Command import qualified Annex.Queue import qualified Annex diff --git a/Command/LockContent.hs b/Command/LockContent.hs index 72b2bb096..ce812ef30 100644 --- a/Command/LockContent.hs +++ b/Command/LockContent.hs @@ -7,10 +7,8 @@ module Command.LockContent where -import Common.Annex import Command import Annex.Content -import Types.Key import Remote.Helper.Ssh (contentLockedMarker) cmd :: Command diff --git a/Command/Log.hs b/Command/Log.hs index 86b32b937..94c085adc 100644 --- a/Command/Log.hs +++ b/Command/Log.hs @@ -19,7 +19,6 @@ import Data.Time import System.Locale #endif -import Common.Annex import Command import Logs import qualified Logs.Presence diff --git a/Command/LookupKey.hs b/Command/LookupKey.hs index 1a0d96935..1f21a582e 100644 --- a/Command/LookupKey.hs +++ b/Command/LookupKey.hs @@ -7,11 +7,8 @@ module Command.LookupKey where -import Common.Annex import Command -import CmdLine.Batch import Annex.CatFile -import Types.Key cmd :: Command cmd = notBareRepo $ noCommit $ diff --git a/Command/Map.hs b/Command/Map.hs index e7789bdac..8aa59e38d 100644 --- a/Command/Map.hs +++ b/Command/Map.hs @@ -9,7 +9,6 @@ module Command.Map where import qualified Data.Map as M -import Common.Annex import Command import qualified Git import qualified Git.Url diff --git a/Command/Merge.hs b/Command/Merge.hs index 8ea4e79e4..6ea8a68b1 100644 --- a/Command/Merge.hs +++ b/Command/Merge.hs @@ -7,7 +7,6 @@ module Command.Merge where -import Common.Annex import Command import qualified Annex.Branch import qualified Git.Branch diff --git a/Command/MetaData.hs b/Command/MetaData.hs index 788c0f2ff..db1179701 100644 --- a/Command/MetaData.hs +++ b/Command/MetaData.hs @@ -7,7 +7,6 @@ module Command.MetaData where -import Common.Annex import Command import Annex.MetaData import Logs.MetaData diff --git a/Command/Migrate.hs b/Command/Migrate.hs index f0100cdc2..0ae6f7d80 100644 --- a/Command/Migrate.hs +++ b/Command/Migrate.hs @@ -7,10 +7,8 @@ module Command.Migrate where -import Common.Annex import Command import Backend -import qualified Types.Key import Types.Backend (canUpgradeKey, fastMigrate) import Types.KeySource import Annex.Content @@ -55,7 +53,7 @@ start file key = do - - Something has changed in the backend, such as a bug fix. -} upgradableKey :: Backend -> Key -> Bool -upgradableKey backend key = isNothing (Types.Key.keySize key) || backendupgradable +upgradableKey backend key = isNothing (keySize key) || backendupgradable where backendupgradable = maybe False (\a -> a key) (canUpgradeKey backend) diff --git a/Command/Mirror.hs b/Command/Mirror.hs index 148ca8d3c..8fdba123b 100644 --- a/Command/Mirror.hs +++ b/Command/Mirror.hs @@ -7,7 +7,6 @@ module Command.Mirror where -import Common.Annex import Command import qualified Command.Move import qualified Command.Drop diff --git a/Command/Move.hs b/Command/Move.hs index 7a0b57c10..710d09d06 100644 --- a/Command/Move.hs +++ b/Command/Move.hs @@ -7,7 +7,6 @@ module Command.Move where -import Common.Annex import Command import qualified Command.Drop import qualified Annex diff --git a/Command/NotifyChanges.hs b/Command/NotifyChanges.hs index 091208349..f1c149d54 100644 --- a/Command/NotifyChanges.hs +++ b/Command/NotifyChanges.hs @@ -7,7 +7,6 @@ module Command.NotifyChanges where -import Common.Annex import Command import Utility.DirWatcher import Utility.DirWatcher.Types diff --git a/Command/NumCopies.hs b/Command/NumCopies.hs index 5675d3161..0a9c4404b 100644 --- a/Command/NumCopies.hs +++ b/Command/NumCopies.hs @@ -7,9 +7,8 @@ module Command.NumCopies where -import Common.Annex -import qualified Annex import Command +import qualified Annex import Annex.NumCopies import Types.Messages diff --git a/Command/PreCommit.hs b/Command/PreCommit.hs index 383a33665..f55318475 100644 --- a/Command/PreCommit.hs +++ b/Command/PreCommit.hs @@ -9,7 +9,6 @@ module Command.PreCommit where -import Common.Annex import Command import Config import qualified Command.Add diff --git a/Command/Proxy.hs b/Command/Proxy.hs index a99e1f4b5..f1f7f194f 100644 --- a/Command/Proxy.hs +++ b/Command/Proxy.hs @@ -7,7 +7,6 @@ module Command.Proxy where -import Common.Annex import Command import Config import Utility.Tmp diff --git a/Command/ReKey.hs b/Command/ReKey.hs index 91329ec82..79c588ccc 100644 --- a/Command/ReKey.hs +++ b/Command/ReKey.hs @@ -7,10 +7,8 @@ module Command.ReKey where -import Common.Annex import Command import qualified Annex -import Types.Key import Annex.Content import Annex.Ingest import Annex.Link diff --git a/Command/ReadPresentKey.hs b/Command/ReadPresentKey.hs index 2b0b51fe3..1eba2cc12 100644 --- a/Command/ReadPresentKey.hs +++ b/Command/ReadPresentKey.hs @@ -7,10 +7,8 @@ module Command.ReadPresentKey where -import Common.Annex import Command import Logs.Location -import Types.Key cmd :: Command cmd = noCommit $ diff --git a/Command/RecvKey.hs b/Command/RecvKey.hs index 51bf69b1f..5bd2d8b59 100644 --- a/Command/RecvKey.hs +++ b/Command/RecvKey.hs @@ -7,7 +7,6 @@ module Command.RecvKey where -import Common.Annex import Command import Annex.Content import Annex.Action diff --git a/Command/RegisterUrl.hs b/Command/RegisterUrl.hs index b2b0d7d32..273d111b0 100644 --- a/Command/RegisterUrl.hs +++ b/Command/RegisterUrl.hs @@ -9,7 +9,6 @@ module Command.RegisterUrl where -import Common.Annex import Command import Logs.Web import Command.FromKey (mkKey) diff --git a/Command/Reinit.hs b/Command/Reinit.hs index e2c00a3d2..25001db43 100644 --- a/Command/Reinit.hs +++ b/Command/Reinit.hs @@ -7,11 +7,9 @@ module Command.Reinit where -import Common.Annex import Command import Annex.Init import Annex.UUID -import Types.UUID import qualified Remote import qualified Annex.SpecialRemote diff --git a/Command/Reinject.hs b/Command/Reinject.hs index 1c21b4ae6..d50db18af 100644 --- a/Command/Reinject.hs +++ b/Command/Reinject.hs @@ -7,7 +7,6 @@ module Command.Reinject where -import Common.Annex import Command import Logs.Location import Annex.Content diff --git a/Command/RemoteDaemon.hs b/Command/RemoteDaemon.hs index 962189da1..7c7ecef4b 100644 --- a/Command/RemoteDaemon.hs +++ b/Command/RemoteDaemon.hs @@ -7,7 +7,6 @@ module Command.RemoteDaemon where -import Common.Annex import Command import RemoteDaemon.Core diff --git a/Command/Repair.hs b/Command/Repair.hs index f4c92b02f..65e929be8 100644 --- a/Command/Repair.hs +++ b/Command/Repair.hs @@ -7,7 +7,6 @@ module Command.Repair where -import Common.Annex import Command import qualified Annex import qualified Git.Repair diff --git a/Command/ResolveMerge.hs b/Command/ResolveMerge.hs index 148ce9e5c..12fe8cfd3 100644 --- a/Command/ResolveMerge.hs +++ b/Command/ResolveMerge.hs @@ -7,7 +7,6 @@ module Command.ResolveMerge where -import Common.Annex import Command import qualified Git import Git.Sha diff --git a/Command/RmUrl.hs b/Command/RmUrl.hs index fe8c1e0cd..eb78f7ba7 100644 --- a/Command/RmUrl.hs +++ b/Command/RmUrl.hs @@ -7,7 +7,6 @@ module Command.RmUrl where -import Common.Annex import Command import Logs.Web import qualified Remote diff --git a/Command/Schedule.hs b/Command/Schedule.hs index 266208f9a..5721e98e7 100644 --- a/Command/Schedule.hs +++ b/Command/Schedule.hs @@ -7,9 +7,8 @@ module Command.Schedule where -import Common.Annex -import qualified Annex import Command +import qualified Annex import qualified Remote import Logs.Schedule import Types.ScheduledActivity diff --git a/Command/SendKey.hs b/Command/SendKey.hs index 3b1cafb42..96fc1bb0d 100644 --- a/Command/SendKey.hs +++ b/Command/SendKey.hs @@ -7,7 +7,6 @@ module Command.SendKey where -import Common.Annex import Command import Annex.Content import Annex diff --git a/Command/SetKey.hs b/Command/SetKey.hs index 13715d3a7..fd7a4ab88 100644 --- a/Command/SetKey.hs +++ b/Command/SetKey.hs @@ -7,11 +7,9 @@ module Command.SetKey where -import Common.Annex import Command import Logs.Location import Annex.Content -import Types.Key cmd :: Command cmd = command "setkey" SectionPlumbing "sets annexed content for a key" diff --git a/Command/SetPresentKey.hs b/Command/SetPresentKey.hs index 831a62883..35ede9553 100644 --- a/Command/SetPresentKey.hs +++ b/Command/SetPresentKey.hs @@ -7,11 +7,9 @@ module Command.SetPresentKey where -import Common.Annex import Command import Logs.Location import Logs.Presence.Pure -import Types.Key cmd :: Command cmd = noCommit $ diff --git a/Command/Smudge.hs b/Command/Smudge.hs index 1ca3de2c3..6718b4908 100644 --- a/Command/Smudge.hs +++ b/Command/Smudge.hs @@ -7,7 +7,6 @@ module Command.Smudge where -import Common.Annex import Command import Annex.Content import Annex.Link diff --git a/Command/Status.hs b/Command/Status.hs index af0a1282f..260cf2ab4 100644 --- a/Command/Status.hs +++ b/Command/Status.hs @@ -7,7 +7,6 @@ module Command.Status where -import Common.Annex import Command import Annex.CatFile import Annex.Content.Direct diff --git a/Command/Sync.hs b/Command/Sync.hs index 2de92188b..0c12fa090 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -19,7 +19,6 @@ module Command.Sync ( updateSyncBranch, ) where -import Common.Annex import Command import qualified Annex import qualified Annex.Branch diff --git a/Command/Test.hs b/Command/Test.hs index 35d6e1504..5180f96ed 100644 --- a/Command/Test.hs +++ b/Command/Test.hs @@ -7,9 +7,7 @@ module Command.Test where -import Common import Command -import Messages import Types.Test cmd :: Parser TestOptions -> Maybe TestRunner -> Command diff --git a/Command/TestRemote.hs b/Command/TestRemote.hs index f66a77ba7..5c5d62e1d 100644 --- a/Command/TestRemote.hs +++ b/Command/TestRemote.hs @@ -7,13 +7,10 @@ module Command.TestRemote where -import Common import Command import qualified Annex import qualified Remote import qualified Types.Remote as Remote -import Types -import Types.Key (key2file, keyBackendName, keySize) import Types.Backend (getKey, verifyKeyContent) import Types.KeySource import Annex.Content @@ -23,10 +20,8 @@ import Utility.Tmp import Utility.Metered import Utility.DataUnits import Utility.CopyFile -import Messages import Types.Messages import Remote.Helper.Chunked -import Locations import Git.Types import Test.Tasty diff --git a/Command/TransferInfo.hs b/Command/TransferInfo.hs index 2b5713d77..4db3f8de3 100644 --- a/Command/TransferInfo.hs +++ b/Command/TransferInfo.hs @@ -7,11 +7,9 @@ module Command.TransferInfo where -import Common.Annex import Command import Annex.Content import Logs.Transfer -import Types.Key import qualified CmdLine.GitAnnexShell.Fields as Fields import Utility.Metered diff --git a/Command/TransferKey.hs b/Command/TransferKey.hs index 56c9ec675..69559f4cf 100644 --- a/Command/TransferKey.hs +++ b/Command/TransferKey.hs @@ -7,7 +7,6 @@ module Command.TransferKey where -import Common.Annex import Command import Annex.Content import Logs.Location diff --git a/Command/TransferKeys.hs b/Command/TransferKeys.hs index 4fb0d9069..005e491b4 100644 --- a/Command/TransferKeys.hs +++ b/Command/TransferKeys.hs @@ -9,13 +9,11 @@ module Command.TransferKeys where -import Common.Annex import Command import Annex.Content import Logs.Location import Annex.Transfer import qualified Remote -import Types.Key import Utility.SimpleProtocol (dupIoHandles) import Git.Types (RemoteName) diff --git a/Command/Trust.hs b/Command/Trust.hs index 33ecc2e64..688dc7f93 100644 --- a/Command/Trust.hs +++ b/Command/Trust.hs @@ -7,7 +7,6 @@ module Command.Trust where -import Common.Annex import Command import qualified Remote import Types.TrustLevel diff --git a/Command/Unannex.hs b/Command/Unannex.hs index 317fd5856..9e6044109 100644 --- a/Command/Unannex.hs +++ b/Command/Unannex.hs @@ -9,7 +9,6 @@ module Command.Unannex where -import Common.Annex import Command import Config import qualified Annex diff --git a/Command/Undo.hs b/Command/Undo.hs index 0692dce34..24c099f92 100644 --- a/Command/Undo.hs +++ b/Command/Undo.hs @@ -7,7 +7,6 @@ module Command.Undo where -import Common.Annex import Command import Config import Annex.Direct diff --git a/Command/Ungroup.hs b/Command/Ungroup.hs index cd2ebdf9b..5f84a375f 100644 --- a/Command/Ungroup.hs +++ b/Command/Ungroup.hs @@ -7,7 +7,6 @@ module Command.Ungroup where -import Common.Annex import Command import qualified Remote import Logs.Group diff --git a/Command/Uninit.hs b/Command/Uninit.hs index cc237db5e..44f4b0ded 100644 --- a/Command/Uninit.hs +++ b/Command/Uninit.hs @@ -7,9 +7,8 @@ module Command.Uninit where -import Common.Annex -import qualified Annex import Command +import qualified Annex import qualified Git import qualified Git.Command import qualified Command.Unannex diff --git a/Command/Unlock.hs b/Command/Unlock.hs index bef800840..ded44fd2f 100644 --- a/Command/Unlock.hs +++ b/Command/Unlock.hs @@ -7,7 +7,6 @@ module Command.Unlock where -import Common.Annex import Command import Annex.Content import Annex.CatFile diff --git a/Command/Unused.hs b/Command/Unused.hs index 84be0eefb..b6f3e93b6 100644 --- a/Command/Unused.hs +++ b/Command/Unused.hs @@ -11,7 +11,6 @@ module Command.Unused where import qualified Data.Map as M -import Common.Annex import Command import Logs.Unused import Annex.Content @@ -28,7 +27,6 @@ import qualified Remote import qualified Annex.Branch import Annex.Link import Annex.CatFile -import Types.Key import Types.RefSpec import Git.Types import Git.Sha diff --git a/Command/Upgrade.hs b/Command/Upgrade.hs index 8a34022e3..432250a1a 100644 --- a/Command/Upgrade.hs +++ b/Command/Upgrade.hs @@ -7,7 +7,6 @@ module Command.Upgrade where -import Common.Annex import Command import Upgrade diff --git a/Command/VAdd.hs b/Command/VAdd.hs index ac70da264..a4b3f379f 100644 --- a/Command/VAdd.hs +++ b/Command/VAdd.hs @@ -7,7 +7,6 @@ module Command.VAdd where -import Common.Annex import Command import Annex.View import Command.View (checkoutViewBranch) diff --git a/Command/VCycle.hs b/Command/VCycle.hs index a3c61d859..20fc9a22a 100644 --- a/Command/VCycle.hs +++ b/Command/VCycle.hs @@ -7,7 +7,6 @@ module Command.VCycle where -import Common.Annex import Command import Annex.View import Types.View diff --git a/Command/VFilter.hs b/Command/VFilter.hs index 259d36068..60bbcd3d3 100644 --- a/Command/VFilter.hs +++ b/Command/VFilter.hs @@ -7,7 +7,6 @@ module Command.VFilter where -import Common.Annex import Command import Annex.View import Command.View (paramView, checkoutViewBranch) diff --git a/Command/VPop.hs b/Command/VPop.hs index ba6f4ee5c..8490567dc 100644 --- a/Command/VPop.hs +++ b/Command/VPop.hs @@ -7,7 +7,6 @@ module Command.VPop where -import Common.Annex import Command import qualified Git import qualified Git.Command diff --git a/Command/Version.hs b/Command/Version.hs index c5a9fcef2..1cfc0aedc 100644 --- a/Command/Version.hs +++ b/Command/Version.hs @@ -7,7 +7,6 @@ module Command.Version where -import Common.Annex import Command import qualified Build.SysConfig as SysConfig import Annex.Version diff --git a/Command/Vicfg.hs b/Command/Vicfg.hs index cec032b80..d7963725a 100644 --- a/Command/Vicfg.hs +++ b/Command/Vicfg.hs @@ -16,7 +16,6 @@ import Data.Tuple (swap) import Data.Char (isSpace) import Data.Default -import Common.Annex import Command import Annex.Perms import Types.TrustLevel diff --git a/Command/View.hs b/Command/View.hs index 3fdbbb9c5..65985fdac 100644 --- a/Command/View.hs +++ b/Command/View.hs @@ -7,7 +7,6 @@ module Command.View where -import Common.Annex import Command import qualified Git import qualified Git.Command diff --git a/Command/Wanted.hs b/Command/Wanted.hs index 649f19c2b..10f684567 100644 --- a/Command/Wanted.hs +++ b/Command/Wanted.hs @@ -7,9 +7,8 @@ module Command.Wanted where -import Common.Annex -import qualified Annex import Command +import qualified Annex import qualified Remote import Logs.PreferredContent import Types.Messages diff --git a/Command/Watch.hs b/Command/Watch.hs index ac2f27397..9bc92d85b 100644 --- a/Command/Watch.hs +++ b/Command/Watch.hs @@ -7,9 +7,8 @@ module Command.Watch where -import Common.Annex -import Assistant import Command +import Assistant import Utility.HumanTime cmd :: Command diff --git a/Command/WebApp.hs b/Command/WebApp.hs index f2935380d..8c11c18bd 100644 --- a/Command/WebApp.hs +++ b/Command/WebApp.hs @@ -9,7 +9,6 @@ module Command.WebApp where -import Common.Annex import Command import Assistant import Assistant.Common diff --git a/Command/Whereis.hs b/Command/Whereis.hs index bf4cbfe97..5b913cf45 100644 --- a/Command/Whereis.hs +++ b/Command/Whereis.hs @@ -7,14 +7,12 @@ module Command.Whereis where -import Common.Annex import Command import Remote import Logs.Trust import Logs.Web import Remote.Web (getWebUrls) import Annex.UUID -import CmdLine.Batch import qualified Data.Map as M diff --git a/Command/XMPPGit.hs b/Command/XMPPGit.hs index 20e7f0743..0a7178df8 100644 --- a/Command/XMPPGit.hs +++ b/Command/XMPPGit.hs @@ -7,7 +7,6 @@ module Command.XMPPGit where -import Common.Annex import Command import Assistant.XMPP.Git @@ -9,7 +9,7 @@ module Config where -import Common.Annex +import Annex.Common import qualified Git import qualified Git.Config import qualified Git.Command @@ -19,7 +19,7 @@ module Creds ( includeCredsInfo, ) where -import Common.Annex +import Annex.Common import qualified Annex import Types.Creds import Annex.Perms @@ -38,9 +38,8 @@ import Data.ByteString.UTF8 (fromString) import qualified Data.Map as M import Control.Monad.IO.Class -import Common.Annex +import Annex.Common import qualified Utility.Gpg as Gpg -import Types.Key import Types.Crypto import Types.Remote diff --git a/Database/Fsck.hs b/Database/Fsck.hs index e7ece34ed..702b52925 100644 --- a/Database/Fsck.hs +++ b/Database/Fsck.hs @@ -22,13 +22,10 @@ module Database.Fsck ( import Database.Types import qualified Database.Queue as H -import Locations +import Annex.Locations import Utility.PosixFiles import Utility.Exception -import Common -import Annex -import Types.Key -import Types.UUID +import Annex.Common import Annex.Perms import Annex.LockFile diff --git a/Database/Keys.hs b/Database/Keys.hs index fdba05312..fe796e206 100644 --- a/Database/Keys.hs +++ b/Database/Keys.hs @@ -24,8 +24,8 @@ import qualified Database.Keys.SQL as SQL import Database.Types import Database.Keys.Handle import qualified Database.Queue as H -import Locations -import Common.Annex hiding (delete) +import Annex.Locations +import Annex.Common hiding (delete) import qualified Annex import Annex.Perms import Annex.LockFile @@ -7,7 +7,7 @@ module Limit where -import Common.Annex +import Annex.Common import qualified Annex import qualified Utility.Matcher import qualified Remote @@ -18,7 +18,6 @@ import Annex.UUID import Logs.Trust import Annex.NumCopies import Types.TrustLevel -import Types.Key import Types.Group import Types.FileMatcher import Types.MetaData diff --git a/Limit/Wanted.hs b/Limit/Wanted.hs index e3305398d..237cb7ae0 100644 --- a/Limit/Wanted.hs +++ b/Limit/Wanted.hs @@ -7,7 +7,7 @@ module Limit.Wanted where -import Common.Annex +import Annex.Common import Annex.Wanted import Limit import Types.FileMatcher @@ -7,8 +7,7 @@ module Logs where -import Common.Annex -import Types.Key +import Annex.Common import Annex.DirHashes {- There are several varieties of log file formats. -} diff --git a/Logs/Activity.hs b/Logs/Activity.hs index 9738fdb1c..6f5bf0deb 100644 --- a/Logs/Activity.hs +++ b/Logs/Activity.hs @@ -14,7 +14,7 @@ module Logs.Activity ( import Data.Time.Clock.POSIX -import Common.Annex +import Annex.Common import qualified Annex.Branch import Logs import Logs.UUIDBased diff --git a/Logs/Chunk.hs b/Logs/Chunk.hs index 8f0e7cedb..b591a2a6d 100644 --- a/Logs/Chunk.hs +++ b/Logs/Chunk.hs @@ -24,7 +24,7 @@ module Logs.Chunk ( getCurrentChunks, ) where -import Common.Annex +import Annex.Common import Logs import Logs.MapLog import qualified Annex.Branch diff --git a/Logs/Chunk/Pure.hs b/Logs/Chunk/Pure.hs index af209d7e1..7fbadb623 100644 --- a/Logs/Chunk/Pure.hs +++ b/Logs/Chunk/Pure.hs @@ -14,7 +14,7 @@ module Logs.Chunk.Pure , showLog ) where -import Common.Annex +import Annex.Common import Logs.MapLog import Data.Int diff --git a/Logs/Difference.hs b/Logs/Difference.hs index fd93fc3cf..9817393e3 100644 --- a/Logs/Difference.hs +++ b/Logs/Difference.hs @@ -15,7 +15,7 @@ module Logs.Difference ( import Data.Time.Clock.POSIX import qualified Data.Map as M -import Common.Annex +import Annex.Common import Types.Difference import qualified Annex.Branch import Logs diff --git a/Logs/Difference/Pure.hs b/Logs/Difference/Pure.hs index 0e68ffd3c..78a11d71f 100644 --- a/Logs/Difference/Pure.hs +++ b/Logs/Difference/Pure.hs @@ -12,7 +12,7 @@ module Logs.Difference.Pure ( import qualified Data.Map as M -import Common.Annex +import Annex.Common import Types.Difference import Logs.UUIDBased diff --git a/Logs/FsckResults.hs b/Logs/FsckResults.hs index e6db9a076..09430e806 100644 --- a/Logs/FsckResults.hs +++ b/Logs/FsckResults.hs @@ -11,7 +11,7 @@ module Logs.FsckResults ( clearFsckResults, ) where -import Common.Annex +import Annex.Common import Utility.Tmp import Git.Fsck import Git.Types diff --git a/Logs/Group.hs b/Logs/Group.hs index 3725c046c..7090e7b45 100644 --- a/Logs/Group.hs +++ b/Logs/Group.hs @@ -20,7 +20,7 @@ import qualified Data.Map as M import qualified Data.Set as S import Data.Time.Clock.POSIX -import Common.Annex +import Annex.Common import Logs import qualified Annex.Branch import qualified Annex diff --git a/Logs/Location.hs b/Logs/Location.hs index 89100805b..2698d7f95 100644 --- a/Logs/Location.hs +++ b/Logs/Location.hs @@ -25,7 +25,7 @@ module Logs.Location ( loggedKeysFor, ) where -import Common.Annex +import Annex.Common import qualified Annex.Branch import Logs import Logs.Presence diff --git a/Logs/MetaData.hs b/Logs/MetaData.hs index 8bc030dc6..52370d2c5 100644 --- a/Logs/MetaData.hs +++ b/Logs/MetaData.hs @@ -33,7 +33,7 @@ module Logs.MetaData ( copyMetaData, ) where -import Common.Annex +import Annex.Common import Types.MetaData import Annex.MetaData.StandardFields import qualified Annex.Branch diff --git a/Logs/NumCopies.hs b/Logs/NumCopies.hs index 3fc29c2f2..a4bca5b07 100644 --- a/Logs/NumCopies.hs +++ b/Logs/NumCopies.hs @@ -13,7 +13,7 @@ module Logs.NumCopies ( globalNumCopiesLoad, ) where -import Common.Annex +import Annex.Common import qualified Annex import Types.NumCopies import Logs diff --git a/Logs/PreferredContent.hs b/Logs/PreferredContent.hs index 035c098f6..712973ee4 100644 --- a/Logs/PreferredContent.hs +++ b/Logs/PreferredContent.hs @@ -27,7 +27,7 @@ import qualified Data.Map as M import qualified Data.Set as S import Data.Either -import Common.Annex +import Annex.Common import Logs.PreferredContent.Raw import qualified Annex.Branch import qualified Annex diff --git a/Logs/PreferredContent/Raw.hs b/Logs/PreferredContent/Raw.hs index 119261ab8..e23b09c55 100644 --- a/Logs/PreferredContent/Raw.hs +++ b/Logs/PreferredContent/Raw.hs @@ -10,7 +10,7 @@ module Logs.PreferredContent.Raw where import qualified Data.Map as M import Data.Time.Clock.POSIX -import Common.Annex +import Annex.Common import qualified Annex.Branch import qualified Annex import Logs diff --git a/Logs/Presence.hs b/Logs/Presence.hs index f90253421..29b786e5e 100644 --- a/Logs/Presence.hs +++ b/Logs/Presence.hs @@ -25,7 +25,7 @@ module Logs.Presence ( import Data.Time.Clock.POSIX import Logs.Presence.Pure as X -import Common.Annex +import Annex.Common import qualified Annex.Branch import Git.Types (RefDate) diff --git a/Logs/Presence/Pure.hs b/Logs/Presence/Pure.hs index 4e5ff68c0..e2ec3f13d 100644 --- a/Logs/Presence/Pure.hs +++ b/Logs/Presence/Pure.hs @@ -10,7 +10,7 @@ module Logs.Presence.Pure where import Data.Time.Clock.POSIX import qualified Data.Map as M -import Common.Annex +import Annex.Common import Logs.TimeStamp import Utility.QuickCheck diff --git a/Logs/Remote.hs b/Logs/Remote.hs index a90eb027c..1eb1c41b1 100644 --- a/Logs/Remote.hs +++ b/Logs/Remote.hs @@ -22,7 +22,7 @@ import qualified Data.Map as M import Data.Time.Clock.POSIX import Data.Char -import Common.Annex +import Annex.Common import qualified Annex.Branch import Types.Remote import Logs diff --git a/Logs/RemoteState.hs b/Logs/RemoteState.hs index b302b739a..ff4979f9c 100644 --- a/Logs/RemoteState.hs +++ b/Logs/RemoteState.hs @@ -10,7 +10,7 @@ module Logs.RemoteState ( setRemoteState, ) where -import Common.Annex +import Annex.Common import Logs import Logs.UUIDBased import qualified Annex.Branch diff --git a/Logs/Schedule.hs b/Logs/Schedule.hs index d2dd0c343..844781d50 100644 --- a/Logs/Schedule.hs +++ b/Logs/Schedule.hs @@ -22,7 +22,7 @@ import qualified Data.Set as S import Data.Time.Clock.POSIX import Data.Time.LocalTime -import Common.Annex +import Annex.Common import Types.ScheduledActivity import qualified Annex.Branch import Logs diff --git a/Logs/SingleValue.hs b/Logs/SingleValue.hs index 213bcd217..9b1306c98 100644 --- a/Logs/SingleValue.hs +++ b/Logs/SingleValue.hs @@ -13,7 +13,7 @@ module Logs.SingleValue where -import Common.Annex +import Annex.Common import qualified Annex.Branch import Logs.TimeStamp diff --git a/Logs/Transfer.hs b/Logs/Transfer.hs index 43d097354..bd910cd55 100644 --- a/Logs/Transfer.hs +++ b/Logs/Transfer.hs @@ -9,10 +9,9 @@ module Logs.Transfer where -import Common.Annex +import Annex.Common import Annex.Perms import qualified Git -import Types.Key import Utility.Metered import Utility.Percentage import Utility.QuickCheck diff --git a/Logs/Transitions.hs b/Logs/Transitions.hs index 5ccfd7e8c..eb9fb433b 100644 --- a/Logs/Transitions.hs +++ b/Logs/Transitions.hs @@ -17,7 +17,7 @@ module Logs.Transitions where import Data.Time.Clock.POSIX import qualified Data.Set as S -import Common.Annex +import Annex.Common import Logs.TimeStamp transitionsLog :: FilePath diff --git a/Logs/Trust.hs b/Logs/Trust.hs index 3d8d7bbae..4f685be91 100644 --- a/Logs/Trust.hs +++ b/Logs/Trust.hs @@ -20,7 +20,7 @@ module Logs.Trust ( import qualified Data.Map as M import Data.Default -import Common.Annex +import Annex.Common import Types.TrustLevel import qualified Annex import Logs diff --git a/Logs/Trust/Basic.hs b/Logs/Trust/Basic.hs index 30e8dfb58..da542d472 100644 --- a/Logs/Trust/Basic.hs +++ b/Logs/Trust/Basic.hs @@ -13,7 +13,7 @@ module Logs.Trust.Basic ( import Data.Time.Clock.POSIX -import Common.Annex +import Annex.Common import Types.TrustLevel import qualified Annex.Branch import qualified Annex diff --git a/Logs/Trust/Pure.hs b/Logs/Trust/Pure.hs index d493db63c..74b7fd38c 100644 --- a/Logs/Trust/Pure.hs +++ b/Logs/Trust/Pure.hs @@ -7,7 +7,7 @@ module Logs.Trust.Pure where -import Common.Annex +import Annex.Common import Types.TrustLevel import Logs.UUIDBased diff --git a/Logs/UUID.hs b/Logs/UUID.hs index 8bdf41b9a..60c8a2ef9 100644 --- a/Logs/UUID.hs +++ b/Logs/UUID.hs @@ -25,7 +25,7 @@ import qualified Data.Map as M import Data.Time.Clock.POSIX import Types.UUID -import Common.Annex +import Annex.Common import qualified Annex import qualified Annex.Branch import Logs diff --git a/Logs/Unused.hs b/Logs/Unused.hs index 7a12f186c..1035d1246 100644 --- a/Logs/Unused.hs +++ b/Logs/Unused.hs @@ -33,9 +33,8 @@ import qualified Data.Set as S import Data.Time.Clock.POSIX import Data.Time -import Common.Annex +import Annex.Common import qualified Annex -import Types.Key import Utility.Tmp import Logs.TimeStamp diff --git a/Logs/View.hs b/Logs/View.hs index 5ba4bf7c2..00bdb3079 100644 --- a/Logs/View.hs +++ b/Logs/View.hs @@ -19,7 +19,7 @@ module Logs.View ( prop_branchView_legal, ) where -import Common.Annex +import Annex.Common import Types.View import Types.MetaData import qualified Git diff --git a/Logs/Web.hs b/Logs/Web.hs index 8e737893e..ba71cb17d 100644 --- a/Logs/Web.hs +++ b/Logs/Web.hs @@ -23,7 +23,7 @@ module Logs.Web ( import qualified Data.ByteString.Lazy.Char8 as L import qualified Data.Map as M -import Common.Annex +import Annex.Common import qualified Annex import Logs import Logs.Presence @@ -59,7 +59,7 @@ import Text.JSON import Text.JSON.Generic import Data.Ord -import Common.Annex +import Annex.Common import Types.Remote import qualified Annex import Annex.UUID diff --git a/Remote/BitTorrent.hs b/Remote/BitTorrent.hs index 8349631de..a0ccf99df 100644 --- a/Remote/BitTorrent.hs +++ b/Remote/BitTorrent.hs @@ -9,7 +9,7 @@ module Remote.BitTorrent (remote) where -import Common.Annex +import Annex.Common import Types.Remote import qualified Annex import qualified Git @@ -18,7 +18,6 @@ import Config.Cost import Logs.Web import Types.UrlContents import Types.CleanupActions -import Types.Key import Messages.Progress import Utility.Metered import Utility.Tmp diff --git a/Remote/Bup.hs b/Remote/Bup.hs index d9d561b0d..ce26cea6e 100644 --- a/Remote/Bup.hs +++ b/Remote/Bup.hs @@ -11,10 +11,9 @@ import qualified Data.Map as M import qualified Data.ByteString.Lazy as L import Data.ByteString.Lazy.UTF8 (fromString) -import Common.Annex +import Annex.Common import qualified Annex import Types.Remote -import Types.Key import Types.Creds import qualified Git import qualified Git.Command diff --git a/Remote/Ddar.hs b/Remote/Ddar.hs index d485d3793..4a46fe15c 100644 --- a/Remote/Ddar.hs +++ b/Remote/Ddar.hs @@ -12,9 +12,8 @@ import qualified Data.Map as M import qualified Data.ByteString.Lazy as L import System.IO.Error -import Common.Annex +import Annex.Common import Types.Remote -import Types.Key import Types.Creds import qualified Git import Config diff --git a/Remote/Directory.hs b/Remote/Directory.hs index 987c3079f..190008078 100644 --- a/Remote/Directory.hs +++ b/Remote/Directory.hs @@ -17,7 +17,7 @@ import qualified Data.ByteString.Lazy as L import qualified Data.Map as M import Data.Default -import Common.Annex +import Annex.Common import Types.Remote import Types.Creds import qualified Git diff --git a/Remote/Directory/LegacyChunked.hs b/Remote/Directory/LegacyChunked.hs index 72d52f95d..095b90b48 100644 --- a/Remote/Directory/LegacyChunked.hs +++ b/Remote/Directory/LegacyChunked.hs @@ -12,7 +12,7 @@ module Remote.Directory.LegacyChunked where import qualified Data.ByteString.Lazy as L import qualified Data.ByteString as S -import Common.Annex +import Annex.Common import Utility.FileMode import Remote.Helper.Special import qualified Remote.Helper.Chunked.Legacy as Legacy diff --git a/Remote/External.hs b/Remote/External.hs index 45720d4a1..20fd4e52c 100644 --- a/Remote/External.hs +++ b/Remote/External.hs @@ -9,11 +9,10 @@ module Remote.External (remote) where import Remote.External.Types import qualified Annex -import Common.Annex +import Annex.Common import Types.Remote import Types.CleanupActions import Types.UrlContents -import Types.Key import qualified Git import Config import Git.Config (isTrue, boolConfig) diff --git a/Remote/External/Types.hs b/Remote/External/Types.hs index 4bb9f6717..80c785798 100644 --- a/Remote/External/Types.hs +++ b/Remote/External/Types.hs @@ -31,8 +31,7 @@ module Remote.External.Types ( supportedProtocolVersions, ) where -import Common.Annex -import Types.Key (file2key, key2file) +import Annex.Common import Types.StandardGroups (PreferredContentExpression) import Utility.Metered (BytesProcessed(..)) import Logs.Transfer (Direction(..)) diff --git a/Remote/GCrypt.hs b/Remote/GCrypt.hs index c720e55b2..eb8172653 100644 --- a/Remote/GCrypt.hs +++ b/Remote/GCrypt.hs @@ -19,7 +19,7 @@ import qualified Data.ByteString.Lazy as L import Control.Exception import Data.Default -import Common.Annex +import Annex.Common import qualified Annex import Types.Remote import Types.GitConfig diff --git a/Remote/Git.hs b/Remote/Git.hs index a377fd38c..9f99dccab 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -13,7 +13,7 @@ module Remote.Git ( repoAvail, ) where -import Common.Annex +import Annex.Common import Annex.Ssh import Types.Remote import Types.GitConfig @@ -36,7 +36,6 @@ import Config import Config.Cost import Annex.Init import Annex.Version -import Types.Key import Types.CleanupActions import qualified CmdLine.GitAnnexShell.Fields as Fields import Logs.Location diff --git a/Remote/Glacier.hs b/Remote/Glacier.hs index 8529b6341..6ba36ccd2 100644 --- a/Remote/Glacier.hs +++ b/Remote/Glacier.hs @@ -11,9 +11,8 @@ import qualified Data.Map as M import qualified Data.Text as T import qualified Data.ByteString.Lazy as L -import Common.Annex +import Annex.Common import Types.Remote -import Types.Key import qualified Git import Config import Config.Cost diff --git a/Remote/Helper/AWS.hs b/Remote/Helper/AWS.hs index 145c48714..4919b4b40 100644 --- a/Remote/Helper/AWS.hs +++ b/Remote/Helper/AWS.hs @@ -10,7 +10,7 @@ module Remote.Helper.AWS where -import Common.Annex +import Annex.Common import Creds import qualified Data.Map as M diff --git a/Remote/Helper/Chunked.hs b/Remote/Helper/Chunked.hs index 7692abeb5..8098abc4f 100644 --- a/Remote/Helper/Chunked.hs +++ b/Remote/Helper/Chunked.hs @@ -17,11 +17,10 @@ module Remote.Helper.Chunked ( checkPresentChunks, ) where -import Common.Annex +import Annex.Common import Utility.DataUnits import Types.StoreRetrieve import Types.Remote -import Types.Key import Logs.Chunk import Utility.Metered import Crypto (EncKey) diff --git a/Remote/Helper/Chunked/Legacy.hs b/Remote/Helper/Chunked/Legacy.hs index ae3a29f32..290220c2c 100644 --- a/Remote/Helper/Chunked/Legacy.hs +++ b/Remote/Helper/Chunked/Legacy.hs @@ -7,7 +7,7 @@ module Remote.Helper.Chunked.Legacy where -import Common.Annex +import Annex.Common import Remote.Helper.Chunked import Utility.Metered diff --git a/Remote/Helper/Encryptable.hs b/Remote/Helper/Encryptable.hs index 562009df6..6d294b915 100644 --- a/Remote/Helper/Encryptable.hs +++ b/Remote/Helper/Encryptable.hs @@ -24,7 +24,7 @@ import qualified "sandi" Codec.Binary.Base64 as B64 import qualified Data.ByteString as B import Data.Bits.Utils -import Common.Annex +import Annex.Common import Types.Remote import Crypto import Types.Crypto diff --git a/Remote/Helper/Git.hs b/Remote/Helper/Git.hs index 3b438a0bb..5c611e46a 100644 --- a/Remote/Helper/Git.hs +++ b/Remote/Helper/Git.hs @@ -7,7 +7,7 @@ module Remote.Helper.Git where -import Common.Annex +import Annex.Common import qualified Git import Types.Availability import qualified Types.Remote as Remote diff --git a/Remote/Helper/Hooks.hs b/Remote/Helper/Hooks.hs index 96cca242e..a8e7c9ad3 100644 --- a/Remote/Helper/Hooks.hs +++ b/Remote/Helper/Hooks.hs @@ -11,7 +11,7 @@ module Remote.Helper.Hooks (addHooks) where import qualified Data.Map as M -import Common.Annex +import Annex.Common import Types.Remote import Types.CleanupActions import qualified Annex diff --git a/Remote/Helper/Http.hs b/Remote/Helper/Http.hs index 81c1654ef..f01dfd922 100644 --- a/Remote/Helper/Http.hs +++ b/Remote/Helper/Http.hs @@ -9,7 +9,7 @@ module Remote.Helper.Http where -import Common.Annex +import Annex.Common import Types.StoreRetrieve import Utility.Metered import Remote.Helper.Special diff --git a/Remote/Helper/Messages.hs b/Remote/Helper/Messages.hs index 6e72758fb..484ea1955 100644 --- a/Remote/Helper/Messages.hs +++ b/Remote/Helper/Messages.hs @@ -9,7 +9,7 @@ module Remote.Helper.Messages where -import Common.Annex +import Annex.Common import qualified Git import qualified Types.Remote as Remote diff --git a/Remote/Helper/ReadOnly.hs b/Remote/Helper/ReadOnly.hs index c0330e453..2b6d7467e 100644 --- a/Remote/Helper/ReadOnly.hs +++ b/Remote/Helper/ReadOnly.hs @@ -12,7 +12,7 @@ module Remote.Helper.ReadOnly , readonlyRemoveKey ) where -import Common.Annex +import Annex.Common import Types.Remote import Types.StoreRetrieve import Utility.Metered diff --git a/Remote/Helper/Special.hs b/Remote/Helper/Special.hs index d586d8c0a..fdadc97b9 100644 --- a/Remote/Helper/Special.hs +++ b/Remote/Helper/Special.hs @@ -32,7 +32,7 @@ module Remote.Helper.Special ( module X ) where -import Common.Annex +import Annex.Common import qualified Annex import Types.StoreRetrieve import Types.Remote diff --git a/Remote/Helper/Ssh.hs b/Remote/Helper/Ssh.hs index 1545fa21d..cef30082b 100644 --- a/Remote/Helper/Ssh.hs +++ b/Remote/Helper/Ssh.hs @@ -7,7 +7,7 @@ module Remote.Helper.Ssh where -import Common.Annex +import Annex.Common import qualified Annex import qualified Git import qualified Git.Url @@ -15,7 +15,6 @@ import Annex.UUID import Annex.Ssh import CmdLine.GitAnnexShell.Fields (Field, fieldName) import qualified CmdLine.GitAnnexShell.Fields as Fields -import Types.Key import Remote.Helper.Messages import Messages.Progress import Utility.Metered diff --git a/Remote/Hook.hs b/Remote/Hook.hs index 5d3c0af5c..fb5afcadb 100644 --- a/Remote/Hook.hs +++ b/Remote/Hook.hs @@ -7,9 +7,8 @@ module Remote.Hook (remote) where -import Common.Annex +import Annex.Common import Types.Remote -import Types.Key import Types.Creds import qualified Git import Config diff --git a/Remote/List.hs b/Remote/List.hs index 5472059bd..07675508f 100644 --- a/Remote/List.hs +++ b/Remote/List.hs @@ -11,7 +11,7 @@ module Remote.List where import qualified Data.Map as M -import Common.Annex +import Annex.Common import qualified Annex import Logs.Remote import Types.Remote diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs index fd6c25c15..a0e30c7f7 100644 --- a/Remote/Rsync.hs +++ b/Remote/Rsync.hs @@ -18,7 +18,7 @@ module Remote.Rsync ( RsyncOpts ) where -import Common.Annex +import Annex.Common import Types.Remote import qualified Git import Config @@ -36,7 +36,6 @@ import Messages.Progress import Utility.Metered import Logs.Transfer import Types.Creds -import Types.Key (isChunkKey) import Annex.DirHashes import Utility.Tmp diff --git a/Remote/Rsync/RsyncUrl.hs b/Remote/Rsync/RsyncUrl.hs index a7a2ac8f6..f7e9ebbb9 100644 --- a/Remote/Rsync/RsyncUrl.hs +++ b/Remote/Rsync/RsyncUrl.hs @@ -10,7 +10,7 @@ module Remote.Rsync.RsyncUrl where import Types -import Locations +import Annex.Locations import Utility.Rsync import Utility.SafeCommand diff --git a/Remote/S3.hs b/Remote/S3.hs index ba30bffeb..961f621fb 100644 --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -31,9 +31,8 @@ import Data.IORef import Data.Bits.Utils import System.Log.Logger -import Common.Annex +import Annex.Common import Types.Remote -import Types.Key import qualified Git import Config import Config.Cost diff --git a/Remote/Tahoe.hs b/Remote/Tahoe.hs index 5c28773ae..aff1aaee0 100644 --- a/Remote/Tahoe.hs +++ b/Remote/Tahoe.hs @@ -27,7 +27,7 @@ import Data.Aeson import Data.ByteString.Lazy.UTF8 (fromString) import Control.Concurrent.STM -import Common.Annex +import Annex.Common import Types.Remote import Types.Creds import qualified Git diff --git a/Remote/Web.hs b/Remote/Web.hs index 143bdb997..6b91ddfc0 100644 --- a/Remote/Web.hs +++ b/Remote/Web.hs @@ -9,7 +9,7 @@ module Remote.Web (remote, getWebUrls) where -import Common.Annex +import Annex.Common import Types.Remote import Remote.Helper.Messages import qualified Git @@ -18,7 +18,6 @@ import Annex.Content import Config.Cost import Logs.Web import Annex.UUID -import Types.Key import Utility.Metered import qualified Annex.Url as Url #ifdef WITH_QUVI diff --git a/Remote/WebDAV.hs b/Remote/WebDAV.hs index 1e4c45d19..35af290ad 100644 --- a/Remote/WebDAV.hs +++ b/Remote/WebDAV.hs @@ -19,7 +19,7 @@ import Network.HTTP.Types import System.IO.Error import Control.Monad.Catch -import Common.Annex +import Annex.Common import Types.Remote import qualified Git import Config diff --git a/Remote/WebDAV/DavLocation.hs b/Remote/WebDAV/DavLocation.hs index 157e7151a..1397ae57e 100644 --- a/Remote/WebDAV/DavLocation.hs +++ b/Remote/WebDAV/DavLocation.hs @@ -11,7 +11,7 @@ module Remote.WebDAV.DavLocation where import Types -import Locations +import Annex.Locations import Utility.Url (URLString) import System.FilePath.Posix -- for manipulating url paths diff --git a/RemoteDaemon/Common.hs b/RemoteDaemon/Common.hs index 50524b44c..9efc0c4a0 100644 --- a/RemoteDaemon/Common.hs +++ b/RemoteDaemon/Common.hs @@ -12,7 +12,7 @@ module RemoteDaemon.Common ) where import qualified Annex -import Common.Annex +import Annex.Common import RemoteDaemon.Types import qualified Git import Annex.CatFile diff --git a/RemoteDaemon/Transport/GCrypt.hs b/RemoteDaemon/Transport/GCrypt.hs index 53bcfec32..48b9da179 100644 --- a/RemoteDaemon/Transport/GCrypt.hs +++ b/RemoteDaemon/Transport/GCrypt.hs @@ -7,7 +7,7 @@ module RemoteDaemon.Transport.GCrypt (transport) where -import Common.Annex +import Annex.Common import RemoteDaemon.Types import RemoteDaemon.Common import RemoteDaemon.Transport.Ssh (transportUsingCmd) diff --git a/RemoteDaemon/Transport/Ssh.hs b/RemoteDaemon/Transport/Ssh.hs index f441913c9..eda6bca1c 100644 --- a/RemoteDaemon/Transport/Ssh.hs +++ b/RemoteDaemon/Transport/Ssh.hs @@ -7,7 +7,7 @@ module RemoteDaemon.Transport.Ssh (transport, transportUsingCmd) where -import Common.Annex +import Annex.Common import Annex.Ssh import RemoteDaemon.Types import RemoteDaemon.Common @@ -48,7 +48,7 @@ import qualified Git.Types import qualified Git.Ref import qualified Git.LsTree import qualified Git.FilePath -import qualified Locations +import qualified Annex.Locations import qualified Types.KeySource import qualified Types.Backend import qualified Types.TrustLevel @@ -143,7 +143,7 @@ properties :: TestTree properties = localOption (QuickCheckTests 1000) $ testGroup "QuickCheck" [ testProperty "prop_isomorphic_deencode_git" Git.Filename.prop_isomorphic_deencode , testProperty "prop_isomorphic_deencode" Utility.Format.prop_isomorphic_deencode - , testProperty "prop_isomorphic_fileKey" Locations.prop_isomorphic_fileKey + , testProperty "prop_isomorphic_fileKey" Annex.Locations.prop_isomorphic_fileKey , testProperty "prop_isomorphic_key_encode" Types.Key.prop_isomorphic_key_encode , testProperty "prop_isomorphic_key_decode" Types.Key.prop_isomorphic_key_decode , testProperty "prop_isomorphic_shellEscape" Utility.SafeCommand.prop_isomorphic_shellEscape @@ -1516,7 +1516,7 @@ test_crypto = do checkFile mvariant filename = Utility.Gpg.checkEncryptionFile gpgcmd filename $ if mvariant == Just Types.Crypto.PubKey then ks else Nothing - key2files cipher = Locations.keyPaths . + key2files cipher = Annex.Locations.keyPaths . Crypto.encryptKey Types.Crypto.HmacSha1 cipher #else test_crypto = putStrLn "gpg testing not implemented on Windows" diff --git a/Types/Backend.hs b/Types/Backend.hs index 7fd0478f7..9a1c44cc8 100644 --- a/Types/Backend.hs +++ b/Types/Backend.hs @@ -1,4 +1,4 @@ -{- git-annex key/value backend data type +{- git-annex key backend data type - - Most things should not need this, using Types instead - diff --git a/Types/Key.hs b/Types/Key.hs index 164887a4d..8c1828c7e 100644 --- a/Types/Key.hs +++ b/Types/Key.hs @@ -1,6 +1,4 @@ {- git-annex Key data type - - - - Most things should not need this, using Types instead - - Copyright 2011-2014 Joey Hess <id@joeyh.name> - diff --git a/Types/StoreRetrieve.hs b/Types/StoreRetrieve.hs index 13710fba2..c87b6cbb9 100644 --- a/Types/StoreRetrieve.hs +++ b/Types/StoreRetrieve.hs @@ -7,7 +7,7 @@ module Types.StoreRetrieve where -import Common.Annex +import Annex.Common import Utility.Metered import qualified Data.ByteString.Lazy as L diff --git a/Types/View.hs b/Types/View.hs index 0426ba977..a6c52b3d2 100644 --- a/Types/View.hs +++ b/Types/View.hs @@ -7,7 +7,7 @@ module Types.View where -import Common.Annex +import Annex.Common import Types.MetaData import Utility.QuickCheck import qualified Git diff --git a/Upgrade.hs b/Upgrade.hs index f9dfb7258..6d7759264 100644 --- a/Upgrade.hs +++ b/Upgrade.hs @@ -9,7 +9,7 @@ module Upgrade where -import Common.Annex +import Annex.Common import Annex.Version #ifndef mingw32_HOST_OS import qualified Upgrade.V0 diff --git a/Upgrade/V0.hs b/Upgrade/V0.hs index b3486f864..5ad2233ce 100644 --- a/Upgrade/V0.hs +++ b/Upgrade/V0.hs @@ -7,7 +7,7 @@ module Upgrade.V0 where -import Common.Annex +import Annex.Common import Annex.Content import qualified Upgrade.V1 diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs index 507af9e3b..165d44912 100644 --- a/Upgrade/V1.hs +++ b/Upgrade/V1.hs @@ -11,8 +11,7 @@ import System.Posix.Types import Data.Char import Data.Default -import Common.Annex -import Types.Key +import Annex.Common import Annex.Content import Logs.Presence import qualified Annex.Queue diff --git a/Upgrade/V2.hs b/Upgrade/V2.hs index 43dc077d0..cf534f7ed 100644 --- a/Upgrade/V2.hs +++ b/Upgrade/V2.hs @@ -7,7 +7,7 @@ module Upgrade.V2 where -import Common.Annex +import Annex.Common import qualified Git import qualified Git.Command import qualified Git.Ref diff --git a/Upgrade/V4.hs b/Upgrade/V4.hs index cb1643ffd..e317c3949 100644 --- a/Upgrade/V4.hs +++ b/Upgrade/V4.hs @@ -7,7 +7,7 @@ module Upgrade.V4 where -import Common.Annex +import Annex.Common import Config import Annex.Direct diff --git a/Upgrade/V5.hs b/Upgrade/V5.hs index 369188fb8..ab6df6689 100644 --- a/Upgrade/V5.hs +++ b/Upgrade/V5.hs @@ -7,7 +7,7 @@ module Upgrade.V5 where -import Common.Annex +import Annex.Common import qualified Annex import Config import Annex.InodeSentinal |