diff options
author | Joey Hess <joeyh@joeyh.name> | 2016-01-20 16:36:33 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2016-01-20 16:36:33 -0400 |
commit | 737e45156eb705be69f076ede54f8c029b9ee315 (patch) | |
tree | 1ce07bbd848a34090aee0138f832ce14f51b673c /Remote | |
parent | 8dd5d180f1f662a8afcb02a33f13e3e1c1c3b7c8 (diff) |
remove 163 lines of code without changing anything except imports
Diffstat (limited to 'Remote')
-rw-r--r-- | Remote/BitTorrent.hs | 3 | ||||
-rw-r--r-- | Remote/Bup.hs | 3 | ||||
-rw-r--r-- | Remote/Ddar.hs | 3 | ||||
-rw-r--r-- | Remote/Directory.hs | 2 | ||||
-rw-r--r-- | Remote/Directory/LegacyChunked.hs | 2 | ||||
-rw-r--r-- | Remote/External.hs | 3 | ||||
-rw-r--r-- | Remote/External/Types.hs | 3 | ||||
-rw-r--r-- | Remote/GCrypt.hs | 2 | ||||
-rw-r--r-- | Remote/Git.hs | 3 | ||||
-rw-r--r-- | Remote/Glacier.hs | 3 | ||||
-rw-r--r-- | Remote/Helper/AWS.hs | 2 | ||||
-rw-r--r-- | Remote/Helper/Chunked.hs | 3 | ||||
-rw-r--r-- | Remote/Helper/Chunked/Legacy.hs | 2 | ||||
-rw-r--r-- | Remote/Helper/Encryptable.hs | 2 | ||||
-rw-r--r-- | Remote/Helper/Git.hs | 2 | ||||
-rw-r--r-- | Remote/Helper/Hooks.hs | 2 | ||||
-rw-r--r-- | Remote/Helper/Http.hs | 2 | ||||
-rw-r--r-- | Remote/Helper/Messages.hs | 2 | ||||
-rw-r--r-- | Remote/Helper/ReadOnly.hs | 2 | ||||
-rw-r--r-- | Remote/Helper/Special.hs | 2 | ||||
-rw-r--r-- | Remote/Helper/Ssh.hs | 3 | ||||
-rw-r--r-- | Remote/Hook.hs | 3 | ||||
-rw-r--r-- | Remote/List.hs | 2 | ||||
-rw-r--r-- | Remote/Rsync.hs | 3 | ||||
-rw-r--r-- | Remote/Rsync/RsyncUrl.hs | 2 | ||||
-rw-r--r-- | Remote/S3.hs | 3 | ||||
-rw-r--r-- | Remote/Tahoe.hs | 2 | ||||
-rw-r--r-- | Remote/Web.hs | 3 | ||||
-rw-r--r-- | Remote/WebDAV.hs | 2 | ||||
-rw-r--r-- | Remote/WebDAV/DavLocation.hs | 2 |
30 files changed, 30 insertions, 43 deletions
diff --git a/Remote/BitTorrent.hs b/Remote/BitTorrent.hs index 8349631de2..a0ccf99df2 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 d9d561b0dd..ce26cea6ef 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 d485d37939..4a46fe15ce 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 987c3079fb..1900080787 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 72d52f95d6..095b90b483 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 45720d4a1b..20fd4e52cc 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 4bb9f67170..80c785798a 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 c720e55b29..eb81726532 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 a377fd38c3..9f99dccab4 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 8529b63415..6ba36ccd2a 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 145c48714d..4919b4b403 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 7692abeb51..8098abc4fa 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 ae3a29f329..290220c2c1 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 562009df65..6d294b9153 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 3b438a0bb4..5c611e46ab 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 96cca242e0..a8e7c9ad3f 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 81c1654ef3..f01dfd9224 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 6e72758fb1..484ea19552 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 c0330e4530..2b6d7467e6 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 d586d8c0a4..fdadc97b97 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 1545fa21db..cef30082ba 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 5d3c0af5c5..fb5afcadbc 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 5472059bda..07675508fe 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 fd6c25c159..a0e30c7f73 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 a7a2ac8f6f..f7e9ebbb9f 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 ba30bffebd..961f621fb8 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 5c28773ae6..aff1aaee05 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 143bdb9978..6b91ddfc00 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 1e4c45d19c..35af290add 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 157e7151a4..1397ae57e5 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 |