summaryrefslogtreecommitdiff
path: root/Remote
diff options
context:
space:
mode:
Diffstat (limited to 'Remote')
-rw-r--r--Remote/BitTorrent.hs3
-rw-r--r--Remote/Bup.hs3
-rw-r--r--Remote/Ddar.hs3
-rw-r--r--Remote/Directory.hs2
-rw-r--r--Remote/Directory/LegacyChunked.hs2
-rw-r--r--Remote/External.hs3
-rw-r--r--Remote/External/Types.hs3
-rw-r--r--Remote/GCrypt.hs2
-rw-r--r--Remote/Git.hs3
-rw-r--r--Remote/Glacier.hs3
-rw-r--r--Remote/Helper/AWS.hs2
-rw-r--r--Remote/Helper/Chunked.hs3
-rw-r--r--Remote/Helper/Chunked/Legacy.hs2
-rw-r--r--Remote/Helper/Encryptable.hs2
-rw-r--r--Remote/Helper/Git.hs2
-rw-r--r--Remote/Helper/Hooks.hs2
-rw-r--r--Remote/Helper/Http.hs2
-rw-r--r--Remote/Helper/Messages.hs2
-rw-r--r--Remote/Helper/ReadOnly.hs2
-rw-r--r--Remote/Helper/Special.hs2
-rw-r--r--Remote/Helper/Ssh.hs3
-rw-r--r--Remote/Hook.hs3
-rw-r--r--Remote/List.hs2
-rw-r--r--Remote/Rsync.hs3
-rw-r--r--Remote/Rsync/RsyncUrl.hs2
-rw-r--r--Remote/S3.hs3
-rw-r--r--Remote/Tahoe.hs2
-rw-r--r--Remote/Web.hs3
-rw-r--r--Remote/WebDAV.hs2
-rw-r--r--Remote/WebDAV/DavLocation.hs2
30 files changed, 30 insertions, 43 deletions
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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-08 03:50:29 +0000