rename
This commit is contained in:
parent
ff21fd4a65
commit
cfe21e85e7
73 changed files with 173 additions and 173 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -10,7 +10,7 @@ module Remote.Web (
|
|||
setUrl
|
||||
) where
|
||||
|
||||
import AnnexCommon
|
||||
import Annex.Common
|
||||
import Types.Remote
|
||||
import qualified Git
|
||||
import UUID
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue