From 74b101d1dd308c5b2afe101b735d09c61b6197c1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 26 Jan 2014 16:36:31 -0400
Subject: [PATCH] reorg

---
 Init.hs => Annex/Init.hs                | 2 +-
 Assistant/WebApp/Configurators/Local.hs | 2 +-
 Checks.hs                               | 2 +-
 CmdLine/GitAnnexShell.hs                | 2 +-
 Command/Assistant.hs                    | 2 +-
 Command/Indirect.hs                     | 2 +-
 Command/Init.hs                         | 2 +-
 Command/Uninit.hs                       | 2 +-
 Command/WebApp.hs                       | 2 +-
 Remote/Git.hs                           | 2 +-
 Test.hs                                 | 4 ++--
 11 files changed, 12 insertions(+), 12 deletions(-)
 rename Init.hs => Annex/Init.hs (99%)

diff --git a/Init.hs b/Annex/Init.hs
similarity index 99%
rename from Init.hs
rename to Annex/Init.hs
index 56bccfa0c1..616bda69b5 100644
--- a/Init.hs
+++ b/Annex/Init.hs
@@ -7,7 +7,7 @@
 
 {-# LANGUAGE CPP #-}
 
-module Init (
+module Annex.Init (
 	ensureInitialized,
 	isInitialized,
 	initialize,
diff --git a/Assistant/WebApp/Configurators/Local.hs b/Assistant/WebApp/Configurators/Local.hs
index e0cb5ce264..1ab290b1b6 100644
--- a/Assistant/WebApp/Configurators/Local.hs
+++ b/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
diff --git a/Checks.hs b/Checks.hs
index 67aa51a2af..7a9cd1e38f 100644
--- a/Checks.hs
+++ b/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
diff --git a/CmdLine/GitAnnexShell.hs b/CmdLine/GitAnnexShell.hs
index fe75467de1..f490792b07 100644
--- a/CmdLine/GitAnnexShell.hs
+++ b/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
diff --git a/Command/Assistant.hs b/Command/Assistant.hs
index 1449743a24..7a05cdfbae 100644
--- a/Command/Assistant.hs
+++ b/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
diff --git a/Command/Indirect.hs b/Command/Indirect.hs
index 194be68213..0da10c5795 100644
--- a/Command/Indirect.hs
+++ b/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]
diff --git a/Command/Init.hs b/Command/Init.hs
index a076cb486e..e8d9af1674 100644
--- a/Command/Init.hs
+++ b/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 $
diff --git a/Command/Uninit.hs b/Command/Uninit.hs
index f608d03fec..3bf6dbe005 100644
--- a/Command/Uninit.hs
+++ b/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 
diff --git a/Command/WebApp.hs b/Command/WebApp.hs
index e433e50c64..9a2d4a38f4 100644
--- a/Command/WebApp.hs
+++ b/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
diff --git a/Remote/Git.hs b/Remote/Git.hs
index dfda2b4df2..93110745cc 100644
--- a/Remote/Git.hs
+++ b/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
diff --git a/Test.hs b/Test.hs
index 3b196e8dd4..0d8e0e3ef8 100644
--- a/Test.hs
+++ b/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