summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-10-15 16:21:08 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-10-15 16:21:08 -0400
commit1a29b5b52eec641a5456d7c8dc24356c90107bc0 (patch)
tree0b902c278129bd085e8db986af168a4e46d3dea6 /Command
parent279150ccd5ad937a44cbff798ab7bb118ad1dbee (diff)
reorganize log modules
no code changes
Diffstat (limited to 'Command')
-rw-r--r--Command/Add.hs2
-rw-r--r--Command/AddUrl.hs2
-rw-r--r--Command/ConfigList.hs2
-rw-r--r--Command/Describe.hs2
-rw-r--r--Command/Drop.hs4
-rw-r--r--Command/DropKey.hs2
-rw-r--r--Command/Fsck.hs6
-rw-r--r--Command/Init.hs2
-rw-r--r--Command/InitRemote.hs12
-rw-r--r--Command/Map.hs4
-rw-r--r--Command/Move.hs4
-rw-r--r--Command/Semitrust.hs4
-rw-r--r--Command/SetKey.hs2
-rw-r--r--Command/Status.hs2
-rw-r--r--Command/Trust.hs4
-rw-r--r--Command/Unannex.hs2
-rw-r--r--Command/Untrust.hs4
-rw-r--r--Command/Unused.hs2
-rw-r--r--Command/Whereis.hs4
19 files changed, 33 insertions, 33 deletions
diff --git a/Command/Add.hs b/Command/Add.hs
index e6e7a7c77..bfddd72ee 100644
--- a/Command/Add.hs
+++ b/Command/Add.hs
@@ -13,7 +13,7 @@ import Command
import qualified Annex
import qualified Annex.Queue
import qualified Backend
-import LocationLog
+import Logs.Location
import Annex.Content
import Utility.Touch
import Backend
diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs
index c5417bf5b..4447dee81 100644
--- a/Command/AddUrl.hs
+++ b/Command/AddUrl.hs
@@ -18,7 +18,7 @@ import qualified Command.Add
import qualified Annex
import qualified Backend.URL
import Annex.Content
-import PresenceLog
+import Logs.Presence
command :: [Command]
command = [repoCommand "addurl" (paramRepeating paramUrl) seek
diff --git a/Command/ConfigList.hs b/Command/ConfigList.hs
index 60f71eee6..b50c759ee 100644
--- a/Command/ConfigList.hs
+++ b/Command/ConfigList.hs
@@ -9,7 +9,7 @@ module Command.ConfigList where
import Common.Annex
import Command
-import UUID
+import Logs.UUID
command :: [Command]
command = [repoCommand "configlist" paramNothing seek
diff --git a/Command/Describe.hs b/Command/Describe.hs
index 336804639..65cd8d0bf 100644
--- a/Command/Describe.hs
+++ b/Command/Describe.hs
@@ -10,7 +10,7 @@ module Command.Describe where
import Common.Annex
import Command
import qualified Remote
-import UUID
+import Logs.UUID
command :: [Command]
command = [repoCommand "describe" (paramPair paramRemote paramDesc) seek
diff --git a/Command/Drop.hs b/Command/Drop.hs
index fabacbb72..dc858fb29 100644
--- a/Command/Drop.hs
+++ b/Command/Drop.hs
@@ -11,9 +11,9 @@ import Common.Annex
import Command
import qualified Remote
import qualified Annex
-import LocationLog
+import Logs.Location
+import Logs.Trust
import Annex.Content
-import Trust
import Config
command :: [Command]
diff --git a/Command/DropKey.hs b/Command/DropKey.hs
index 35ebfc219..fde6ce02e 100644
--- a/Command/DropKey.hs
+++ b/Command/DropKey.hs
@@ -10,7 +10,7 @@ module Command.DropKey where
import Common.Annex
import Command
import qualified Annex
-import LocationLog
+import Logs.Location
import Annex.Content
command :: [Command]
diff --git a/Command/Fsck.hs b/Command/Fsck.hs
index 16e834fbf..632570b11 100644
--- a/Command/Fsck.hs
+++ b/Command/Fsck.hs
@@ -12,10 +12,10 @@ import Command
import qualified Remote
import qualified Types.Backend
import qualified Types.Key
-import UUID
import Annex.Content
-import LocationLog
-import Trust
+import Logs.Location
+import Logs.Trust
+import Logs.UUID
import Utility.DataUnits
import Utility.FileMode
import Config
diff --git a/Command/Init.hs b/Command/Init.hs
index b9dffb5cd..dcc6bfe6b 100644
--- a/Command/Init.hs
+++ b/Command/Init.hs
@@ -9,7 +9,7 @@ module Command.Init where
import Common.Annex
import Command
-import UUID
+import Logs.UUID
import Init
command :: [Command]
diff --git a/Command/InitRemote.hs b/Command/InitRemote.hs
index 918604f85..240528b87 100644
--- a/Command/InitRemote.hs
+++ b/Command/InitRemote.hs
@@ -12,9 +12,9 @@ import qualified Data.Map as M
import Common.Annex
import Command
import qualified Remote
-import qualified RemoteLog
+import qualified Logs.Remote
import qualified Types.Remote as R
-import UUID
+import Logs.UUID
command :: [Command]
command = [repoCommand "initremote"
@@ -38,7 +38,7 @@ start ws = do
where
name = head ws
- config = RemoteLog.keyValToConfig $ tail ws
+ config = Logs.Remote.keyValToConfig $ tail ws
needname = do
let err s = error $ "Specify a name for the remote. " ++ s
names <- remoteNames
@@ -54,13 +54,13 @@ perform t u c = do
cleanup :: UUID -> R.RemoteConfig -> CommandCleanup
cleanup u c = do
- RemoteLog.configSet u c
+ Logs.Remote.configSet u c
return True
{- Look up existing remote's UUID and config by name, or generate a new one -}
findByName :: String -> Annex (UUID, R.RemoteConfig)
findByName name = do
- m <- RemoteLog.readRemoteLog
+ m <- Logs.Remote.readRemoteLog
maybe generate return $ findByName' name m
where
generate = do
@@ -79,7 +79,7 @@ findByName' n m = if null matches then Nothing else Just $ head matches
remoteNames :: Annex [String]
remoteNames = do
- m <- RemoteLog.readRemoteLog
+ m <- Logs.Remote.readRemoteLog
return $ mapMaybe (M.lookup nameKey . snd) $ M.toList m
{- find the specified remote type -}
diff --git a/Command/Map.hs b/Command/Map.hs
index 1155c4a6e..5cbf51b27 100644
--- a/Command/Map.hs
+++ b/Command/Map.hs
@@ -13,8 +13,8 @@ import qualified Data.Map as M
import Common.Annex
import Command
import qualified Git
-import UUID
-import Trust
+import Logs.UUID
+import Logs.Trust
import Utility.Ssh
import qualified Utility.Dot as Dot
diff --git a/Command/Move.hs b/Command/Move.hs
index 52eb49da1..62f38224c 100644
--- a/Command/Move.hs
+++ b/Command/Move.hs
@@ -11,10 +11,10 @@ import Common.Annex
import Command
import qualified Command.Drop
import qualified Annex
-import LocationLog
+import Logs.Location
import Annex.Content
import qualified Remote
-import UUID
+import Logs.UUID
command :: [Command]
command = [repoCommand "move" paramPaths seek
diff --git a/Command/Semitrust.hs b/Command/Semitrust.hs
index 53b29c98a..e13785a38 100644
--- a/Command/Semitrust.hs
+++ b/Command/Semitrust.hs
@@ -10,8 +10,8 @@ module Command.Semitrust where
import Common.Annex
import Command
import qualified Remote
-import UUID
-import Trust
+import Logs.UUID
+import Logs.Trust
command :: [Command]
command = [repoCommand "semitrust" (paramRepeating paramRemote) seek
diff --git a/Command/SetKey.hs b/Command/SetKey.hs
index 28bc9a48d..b707e0b91 100644
--- a/Command/SetKey.hs
+++ b/Command/SetKey.hs
@@ -9,7 +9,7 @@ module Command.SetKey where
import Common.Annex
import Command
-import LocationLog
+import Logs.Location
import Annex.Content
command :: [Command]
diff --git a/Command/Status.hs b/Command/Status.hs
index 37e13f0d8..70282b79e 100644
--- a/Command/Status.hs
+++ b/Command/Status.hs
@@ -23,7 +23,7 @@ import Utility.DataUnits
import Annex.Content
import Types.Key
import Backend
-import UUID
+import Logs.UUID
import Remote
-- a named computation that produces a statistic
diff --git a/Command/Trust.hs b/Command/Trust.hs
index bc655e3f6..fb7f47ec0 100644
--- a/Command/Trust.hs
+++ b/Command/Trust.hs
@@ -10,8 +10,8 @@ module Command.Trust where
import Common.Annex
import Command
import qualified Remote
-import Trust
-import UUID
+import Logs.Trust
+import Logs.UUID
command :: [Command]
command = [repoCommand "trust" (paramRepeating paramRemote) seek
diff --git a/Command/Unannex.hs b/Command/Unannex.hs
index d0cef7678..083984d0c 100644
--- a/Command/Unannex.hs
+++ b/Command/Unannex.hs
@@ -13,7 +13,7 @@ import qualified Command.Drop
import qualified Annex
import qualified Annex.Queue
import Utility.FileMode
-import LocationLog
+import Logs.Location
import Annex.Content
import qualified Git
import qualified Git.LsFiles as LsFiles
diff --git a/Command/Untrust.hs b/Command/Untrust.hs
index bcde0e0a0..6f2b60203 100644
--- a/Command/Untrust.hs
+++ b/Command/Untrust.hs
@@ -10,8 +10,8 @@ module Command.Untrust where
import Common.Annex
import Command
import qualified Remote
-import UUID
-import Trust
+import Logs.UUID
+import Logs.Trust
command :: [Command]
command = [repoCommand "untrust" (paramRepeating paramRemote) seek
diff --git a/Command/Unused.hs b/Command/Unused.hs
index abf5a5361..874b0ca06 100644
--- a/Command/Unused.hs
+++ b/Command/Unused.hs
@@ -16,7 +16,7 @@ import Common.Annex
import Command
import Annex.Content
import Utility.FileMode
-import LocationLog
+import Logs.Location
import qualified Annex
import qualified Git
import qualified Git.LsFiles as LsFiles
diff --git a/Command/Whereis.hs b/Command/Whereis.hs
index 0eeb17414..b1646ae69 100644
--- a/Command/Whereis.hs
+++ b/Command/Whereis.hs
@@ -8,10 +8,10 @@
module Command.Whereis where
import Common.Annex
-import LocationLog
+import Logs.Location
import Command
import Remote
-import Trust
+import Logs.Trust
command :: [Command]
command = [repoCommand "whereis" paramPaths seek