summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-01-26 16:36:31 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-01-26 16:36:31 -0400
commitda0b9c92faa431199589d2d9ea98ea60af6a333f (patch)
treedb86f4de9eef446f2e729553339050a07a058c78
parent95bd07a3e733d7ef62539423f066f461c83ba36e (diff)
reorg
-rw-r--r--Annex/Init.hs (renamed from Init.hs)2
-rw-r--r--Checks.hs2
-rw-r--r--CmdLine/GitAnnexShell.hs2
-rw-r--r--Command/Assistant.hs2
-rw-r--r--Command/Indirect.hs2
-rw-r--r--Command/Init.hs2
-rw-r--r--Command/Uninit.hs2
-rw-r--r--Command/WebApp.hs2
-rw-r--r--Remote/Git.hs2
-rw-r--r--Test.hs4
10 files changed, 11 insertions, 11 deletions
diff --git a/Init.hs b/Annex/Init.hs
index 56bccfa0c..616bda69b 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/Checks.hs b/Checks.hs
index 67aa51a2a..7a9cd1e38 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 fe75467de..f490792b0 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 1449743a2..7a05cdfba 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 194be6821..0da10c579 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 a076cb486..e8d9af167 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 f608d03fe..3bf6dbe00 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 e433e50c6..9a2d4a38f 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 dfda2b4df..93110745c 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 3b196e8dd..0d8e0e3ef 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