reorg
This commit is contained in:
parent
1ca111620d
commit
74b101d1dd
11 changed files with 12 additions and 12 deletions
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
{-# LANGUAGE CPP #-}
|
{-# LANGUAGE CPP #-}
|
||||||
|
|
||||||
module Init (
|
module Annex.Init (
|
||||||
ensureInitialized,
|
ensureInitialized,
|
||||||
isInitialized,
|
isInitialized,
|
||||||
initialize,
|
initialize,
|
|
@ -14,7 +14,7 @@ import Assistant.WebApp.Gpg
|
||||||
import Assistant.WebApp.MakeRemote
|
import Assistant.WebApp.MakeRemote
|
||||||
import Assistant.Sync
|
import Assistant.Sync
|
||||||
import Assistant.Restart
|
import Assistant.Restart
|
||||||
import Init
|
import Annex.Init
|
||||||
import qualified Git
|
import qualified Git
|
||||||
import qualified Git.Construct
|
import qualified Git.Construct
|
||||||
import qualified Git.Config
|
import qualified Git.Config
|
||||||
|
|
|
@ -12,7 +12,7 @@ module Checks where
|
||||||
|
|
||||||
import Common.Annex
|
import Common.Annex
|
||||||
import Types.Command
|
import Types.Command
|
||||||
import Init
|
import Annex.Init
|
||||||
import Config
|
import Config
|
||||||
import Utility.Daemon
|
import Utility.Daemon
|
||||||
import qualified Git
|
import qualified Git
|
||||||
|
|
|
@ -20,7 +20,7 @@ import CmdLine.GitAnnexShell.Fields
|
||||||
import Utility.UserInfo
|
import Utility.UserInfo
|
||||||
import Remote.GCrypt (getGCryptUUID)
|
import Remote.GCrypt (getGCryptUUID)
|
||||||
import qualified Annex
|
import qualified Annex
|
||||||
import Init
|
import Annex.Init
|
||||||
|
|
||||||
import qualified Command.ConfigList
|
import qualified Command.ConfigList
|
||||||
import qualified Command.InAnnex
|
import qualified Command.InAnnex
|
||||||
|
|
|
@ -10,7 +10,7 @@ module Command.Assistant where
|
||||||
import Common.Annex
|
import Common.Annex
|
||||||
import Command
|
import Command
|
||||||
import qualified Command.Watch
|
import qualified Command.Watch
|
||||||
import Init
|
import Annex.Init
|
||||||
import Config.Files
|
import Config.Files
|
||||||
import qualified Build.SysConfig
|
import qualified Build.SysConfig
|
||||||
import Utility.HumanTime
|
import Utility.HumanTime
|
||||||
|
|
|
@ -23,7 +23,7 @@ import Annex.Content
|
||||||
import Annex.Content.Direct
|
import Annex.Content.Direct
|
||||||
import Annex.CatFile
|
import Annex.CatFile
|
||||||
import Annex.Exception
|
import Annex.Exception
|
||||||
import Init
|
import Annex.Init
|
||||||
import qualified Command.Add
|
import qualified Command.Add
|
||||||
|
|
||||||
def :: [Command]
|
def :: [Command]
|
||||||
|
|
|
@ -9,7 +9,7 @@ module Command.Init where
|
||||||
|
|
||||||
import Common.Annex
|
import Common.Annex
|
||||||
import Command
|
import Command
|
||||||
import Init
|
import Annex.Init
|
||||||
|
|
||||||
def :: [Command]
|
def :: [Command]
|
||||||
def = [dontCheck repoExists $
|
def = [dontCheck repoExists $
|
||||||
|
|
|
@ -12,9 +12,9 @@ import Command
|
||||||
import qualified Git
|
import qualified Git
|
||||||
import qualified Git.Command
|
import qualified Git.Command
|
||||||
import qualified Command.Unannex
|
import qualified Command.Unannex
|
||||||
import Init
|
|
||||||
import qualified Annex.Branch
|
import qualified Annex.Branch
|
||||||
import Annex.Content
|
import Annex.Content
|
||||||
|
import Annex.Init
|
||||||
|
|
||||||
def :: [Command]
|
def :: [Command]
|
||||||
def = [addCheck check $ command "uninit" paramPaths seek
|
def = [addCheck check $ command "uninit" paramPaths seek
|
||||||
|
|
|
@ -23,7 +23,7 @@ import Utility.Daemon (checkDaemon)
|
||||||
#ifdef __ANDROID__
|
#ifdef __ANDROID__
|
||||||
import Utility.Env
|
import Utility.Env
|
||||||
#endif
|
#endif
|
||||||
import Init
|
import Annex.Init
|
||||||
import qualified Git
|
import qualified Git
|
||||||
import qualified Git.Config
|
import qualified Git.Config
|
||||||
import qualified Git.CurrentRepo
|
import qualified Git.CurrentRepo
|
||||||
|
|
|
@ -34,7 +34,7 @@ import qualified Annex.Url as Url
|
||||||
import Utility.Tmp
|
import Utility.Tmp
|
||||||
import Config
|
import Config
|
||||||
import Config.Cost
|
import Config.Cost
|
||||||
import Init
|
import Annex.Init
|
||||||
import Types.Key
|
import Types.Key
|
||||||
import qualified CmdLine.GitAnnexShell.Fields as Fields
|
import qualified CmdLine.GitAnnexShell.Fields as Fields
|
||||||
import Logs.Location
|
import Logs.Location
|
||||||
|
|
4
Test.hs
4
Test.hs
|
@ -50,7 +50,7 @@ import qualified Types.Messages
|
||||||
import qualified Config
|
import qualified Config
|
||||||
import qualified Config.Cost
|
import qualified Config.Cost
|
||||||
import qualified Crypto
|
import qualified Crypto
|
||||||
import qualified Init
|
import qualified Annex.Init
|
||||||
import qualified Utility.Path
|
import qualified Utility.Path
|
||||||
import qualified Utility.FileMode
|
import qualified Utility.FileMode
|
||||||
import qualified Build.SysConfig
|
import qualified Build.SysConfig
|
||||||
|
@ -1106,7 +1106,7 @@ intmpclonerepoInDirect env a = intmpclonerepo env $
|
||||||
)
|
)
|
||||||
where
|
where
|
||||||
isdirect = annexeval $ do
|
isdirect = annexeval $ do
|
||||||
Init.initialize Nothing
|
Annex.Init.initialize Nothing
|
||||||
Config.isDirect
|
Config.isDirect
|
||||||
|
|
||||||
intmpbareclonerepo :: TestEnv -> Assertion -> Assertion
|
intmpbareclonerepo :: TestEnv -> Assertion -> Assertion
|
||||||
|
|
Loading…
Reference in a new issue