reorg

Annex/Init.hs

@@ -7,7 +7,7 @@
 
 {-# LANGUAGE CPP #-}
 
-module Init (
+module Annex.Init (
 	ensureInitialized,
 	isInitialized,
 	initialize,

Assistant/WebApp/Configurators/Local.hs

@@ -14,7 +14,7 @@ import Assistant.WebApp.Gpg
 import Assistant.WebApp.MakeRemote
 import Assistant.Sync
 import Assistant.Restart
-import Init
+import Annex.Init
 import qualified Git
 import qualified Git.Construct
 import qualified Git.Config

Checks.hs

@@ -12,7 +12,7 @@ module Checks where
 
 import Common.Annex
 import Types.Command
-import Init
+import Annex.Init
 import Config
 import Utility.Daemon
 import qualified Git

CmdLine/GitAnnexShell.hs

@@ -20,7 +20,7 @@ import CmdLine.GitAnnexShell.Fields
 import Utility.UserInfo
 import Remote.GCrypt (getGCryptUUID)
 import qualified Annex
-import Init
+import Annex.Init
 
 import qualified Command.ConfigList
 import qualified Command.InAnnex

Command/Assistant.hs

@@ -10,7 +10,7 @@ module Command.Assistant where
 import Common.Annex
 import Command
 import qualified Command.Watch
-import Init
+import Annex.Init
 import Config.Files
 import qualified Build.SysConfig
 import Utility.HumanTime

Command/Indirect.hs

@@ -23,7 +23,7 @@ import Annex.Content
 import Annex.Content.Direct
 import Annex.CatFile
 import Annex.Exception
-import Init
+import Annex.Init
 import qualified Command.Add
 
 def :: [Command]

Command/Init.hs

@@ -9,7 +9,7 @@ module Command.Init where
 
 import Common.Annex
 import Command
-import Init
+import Annex.Init
 	
 def :: [Command]
 def = [dontCheck repoExists $

Command/Uninit.hs

@@ -12,9 +12,9 @@ import Command
 import qualified Git
 import qualified Git.Command
 import qualified Command.Unannex
-import Init
 import qualified Annex.Branch
 import Annex.Content
+import Annex.Init
 
 def :: [Command]
 def = [addCheck check $ command "uninit" paramPaths seek 

Command/WebApp.hs

@@ -23,7 +23,7 @@ import Utility.Daemon (checkDaemon)
 #ifdef __ANDROID__
 import Utility.Env
 #endif
-import Init
+import Annex.Init
 import qualified Git
 import qualified Git.Config
 import qualified Git.CurrentRepo

Remote/Git.hs

@@ -34,7 +34,7 @@ import qualified Annex.Url as Url
 import Utility.Tmp
 import Config
 import Config.Cost
-import Init
+import Annex.Init
 import Types.Key
 import qualified CmdLine.GitAnnexShell.Fields as Fields
 import Logs.Location

Test.hs

@@ -50,7 +50,7 @@ import qualified Types.Messages
 import qualified Config
 import qualified Config.Cost
 import qualified Crypto
-import qualified Init
+import qualified Annex.Init
 import qualified Utility.Path
 import qualified Utility.FileMode
 import qualified Build.SysConfig
@@ -1106,7 +1106,7 @@ intmpclonerepoInDirect env a = intmpclonerepo env $
 		)
   where
   	isdirect = annexeval $ do
-		Init.initialize Nothing
+		Annex.Init.initialize Nothing
 		Config.isDirect
 
 intmpbareclonerepo :: TestEnv -> Assertion -> Assertion