diff options
Diffstat (limited to 'Remote')
| -rw-r--r-- | Remote/Bup.hs | 2 | ||||
| -rw-r--r-- | Remote/Directory.hs | 2 | ||||
| -rw-r--r-- | Remote/Git.hs | 10 | ||||
| -rw-r--r-- | Remote/Helper/Encryptable.hs | 2 | ||||
| -rw-r--r-- | Remote/Helper/Special.hs | 2 | ||||
| -rw-r--r-- | Remote/Hook.hs | 4 | ||||
| -rw-r--r-- | Remote/Rsync.hs | 4 | ||||
| -rw-r--r-- | Remote/S3real.hs | 4 | ||||
| -rw-r--r-- | Remote/Web.hs | 2 |
9 files changed, 16 insertions, 16 deletions
diff --git a/Remote/Bup.hs b/Remote/Bup.hs index 958831019..2d0ba4742 100644 --- a/Remote/Bup.hs +++ b/Remote/Bup.hs @@ -12,7 +12,7 @@ import System.IO.Error import qualified Data.Map as M import System.Process -import AnnexCommon +import Annex.Common import Types.Remote import qualified Git import UUID diff --git a/Remote/Directory.hs b/Remote/Directory.hs index 664f8ca5f..bfea850e5 100644 --- a/Remote/Directory.hs +++ b/Remote/Directory.hs @@ -11,7 +11,7 @@ import qualified Data.ByteString.Lazy.Char8 as L import System.IO.Error import qualified Data.Map as M -import AnnexCommon +import Annex.Common import Utility.CopyFile import Types.Remote import qualified Git diff --git a/Remote/Git.hs b/Remote/Git.hs index a457c5905..15e8991f5 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -10,7 +10,7 @@ module Remote.Git (remote) where import Control.Exception.Extensible import qualified Data.Map as M -import AnnexCommon +import Annex.Common import Utility.CopyFile import Utility.RsyncFile import Utility.Ssh @@ -18,7 +18,7 @@ import Types.Remote import qualified Git import qualified Annex import UUID -import qualified Content +import qualified Annex.Content import qualified Utility.Url as Url import Config import Init @@ -121,7 +121,7 @@ inAnnex r key | Git.repoIsUrl r = checkremote | otherwise = safely checklocal where - checklocal = onLocal r (Content.inAnnex key) + checklocal = onLocal r (Annex.Content.inAnnex key) checkremote = do showAction $ "checking " ++ Git.repoDescribe r inannex <- onRemote r (boolSystem, False) "inannex" @@ -164,9 +164,9 @@ copyToRemote r key let keysrc = gitAnnexLocation g key -- run copy from perspective of remote liftIO $ onLocal r $ do - ok <- Content.getViaTmp key $ + ok <- Annex.Content.getViaTmp key $ rsyncOrCopyFile r keysrc - Content.saveState + Annex.Content.saveState return ok | Git.repoIsSsh r = do g <- gitRepo diff --git a/Remote/Helper/Encryptable.hs b/Remote/Helper/Encryptable.hs index 42503e4d4..6f43b4367 100644 --- a/Remote/Helper/Encryptable.hs +++ b/Remote/Helper/Encryptable.hs @@ -9,7 +9,7 @@ module Remote.Helper.Encryptable where import qualified Data.Map as M -import AnnexCommon +import Annex.Common import Types.Remote import Crypto import qualified Annex diff --git a/Remote/Helper/Special.hs b/Remote/Helper/Special.hs index 905db04c5..c4e0b7f07 100644 --- a/Remote/Helper/Special.hs +++ b/Remote/Helper/Special.hs @@ -9,7 +9,7 @@ module Remote.Helper.Special where import qualified Data.Map as M -import AnnexCommon +import Annex.Common import Types.Remote import qualified Git import UUID diff --git a/Remote/Hook.hs b/Remote/Hook.hs index 3bbda1924..a18bc51e6 100644 --- a/Remote/Hook.hs +++ b/Remote/Hook.hs @@ -12,12 +12,12 @@ import qualified Data.Map as M import System.IO.Error (try) import System.Exit -import AnnexCommon +import Annex.Common import Types.Remote import qualified Git import UUID import Config -import Content +import Annex.Content import Remote.Helper.Special import Remote.Helper.Encryptable import Crypto diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs index 6a1c297c5..9b870f2b1 100644 --- a/Remote/Rsync.hs +++ b/Remote/Rsync.hs @@ -10,12 +10,12 @@ module Remote.Rsync (remote) where import qualified Data.ByteString.Lazy.Char8 as L import qualified Data.Map as M -import AnnexCommon +import Annex.Common import Types.Remote import qualified Git import UUID import Config -import Content +import Annex.Content import Remote.Helper.Special import Remote.Helper.Encryptable import Crypto diff --git a/Remote/S3real.hs b/Remote/S3real.hs index b2ea4b0c8..c846390b8 100644 --- a/Remote/S3real.hs +++ b/Remote/S3real.hs @@ -17,7 +17,7 @@ import Data.Char import System.Environment import System.Posix.Env (setEnv) -import AnnexCommon +import Annex.Common import Types.Remote import Types.Key import qualified Git @@ -26,7 +26,7 @@ import Config import Remote.Helper.Special import Remote.Helper.Encryptable import Crypto -import Content +import Annex.Content import Utility.Base64 remote :: RemoteType Annex diff --git a/Remote/Web.hs b/Remote/Web.hs index 732f4d46c..9132967c7 100644 --- a/Remote/Web.hs +++ b/Remote/Web.hs @@ -10,7 +10,7 @@ module Remote.Web ( setUrl ) where -import AnnexCommon +import Annex.Common import Types.Remote import qualified Git import UUID |