summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-08-22 16:14:12 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-08-22 16:14:12 -0400
commit203148363f459635b1be40b8c6ed376073230dda (patch)
tree422df5684fc77663c6a3c7fd601c1eff27b3758b /Command
parent4c73d77b42e97ad740d5731ad73c40a31c0c84f9 (diff)
split groups of related functions out of Utility
Diffstat (limited to 'Command')
-rw-r--r--Command/Add.hs3
-rw-r--r--Command/AddUrl.hs2
-rw-r--r--Command/Drop.hs1
-rw-r--r--Command/DropUnused.hs2
-rw-r--r--Command/Find.hs2
-rw-r--r--Command/Fix.hs3
-rw-r--r--Command/FromKey.hs3
-rw-r--r--Command/Fsck.hs1
-rw-r--r--Command/Lock.hs2
-rw-r--r--Command/Map.hs2
-rw-r--r--Command/Migrate.hs2
-rw-r--r--Command/RecvKey.hs2
-rw-r--r--Command/SendKey.hs2
-rw-r--r--Command/SetKey.hs2
-rw-r--r--Command/Unannex.hs3
-rw-r--r--Command/Uninit.hs2
-rw-r--r--Command/Unlock.hs3
17 files changed, 22 insertions, 15 deletions
diff --git a/Command/Add.hs b/Command/Add.hs
index 407a36093..579c4171b 100644
--- a/Command/Add.hs
+++ b/Command/Add.hs
@@ -23,8 +23,9 @@ import LocationLog
import Types
import Content
import Messages
-import Utility
+import Utility.Conditional
import Utility.Touch
+import Utility.SafeCommand
import Locations
command :: [Command]
diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs
index 72a6b671d..55e51100c 100644
--- a/Command/AddUrl.hs
+++ b/Command/AddUrl.hs
@@ -23,7 +23,7 @@ import Messages
import Content
import PresenceLog
import Locations
-import Utility
+import Utility.Path
command :: [Command]
command = [repoCommand "addurl" paramPath seek "add urls to annex"]
diff --git a/Command/Drop.hs b/Command/Drop.hs
index 14f098349..6e688d663 100644
--- a/Command/Drop.hs
+++ b/Command/Drop.hs
@@ -15,6 +15,7 @@ import Types
import Content
import Messages
import Utility
+import Utility.Conditional
import Trust
import Config
diff --git a/Command/DropUnused.hs b/Command/DropUnused.hs
index 41bcd6aa7..4ad2aa85b 100644
--- a/Command/DropUnused.hs
+++ b/Command/DropUnused.hs
@@ -22,7 +22,7 @@ import qualified Command.Move
import qualified Remote
import qualified Git
import Types.Key
-import Utility
+import Utility.Conditional
type UnusedMap = M.Map String Key
diff --git a/Command/Find.hs b/Command/Find.hs
index 9d760ff5a..0716c5297 100644
--- a/Command/Find.hs
+++ b/Command/Find.hs
@@ -11,7 +11,7 @@ import Control.Monad.State (liftIO)
import Command
import Content
-import Utility
+import Utility.Conditional
command :: [Command]
command = [repoCommand "find" (paramOptional $ paramRepeating paramPath) seek
diff --git a/Command/Fix.hs b/Command/Fix.hs
index 47b0c4c9a..b24f8e33c 100644
--- a/Command/Fix.hs
+++ b/Command/Fix.hs
@@ -13,7 +13,8 @@ import System.Directory
import Command
import qualified AnnexQueue
-import Utility
+import Utility.Path
+import Utility.SafeCommand
import Content
import Messages
diff --git a/Command/FromKey.hs b/Command/FromKey.hs
index d59f1de39..89c3f4e91 100644
--- a/Command/FromKey.hs
+++ b/Command/FromKey.hs
@@ -14,10 +14,11 @@ import Control.Monad (unless)
import Command
import qualified AnnexQueue
-import Utility
+import Utility.SafeCommand
import Content
import Messages
import Types.Key
+import Utility.Path
command :: [Command]
command = [repoCommand "fromkey" paramPath seek
diff --git a/Command/Fsck.hs b/Command/Fsck.hs
index 0d3ecb58f..6ccec05fb 100644
--- a/Command/Fsck.hs
+++ b/Command/Fsck.hs
@@ -27,6 +27,7 @@ import LocationLog
import Locations
import Trust
import Utility.DataUnits
+import Utility.Path
import Config
command :: [Command]
diff --git a/Command/Lock.hs b/Command/Lock.hs
index d39df5f33..77d1ff94f 100644
--- a/Command/Lock.hs
+++ b/Command/Lock.hs
@@ -13,7 +13,7 @@ import System.Directory
import Command
import Messages
import qualified AnnexQueue
-import Utility
+import Utility.SafeCommand
command :: [Command]
command = [repoCommand "lock" paramPath seek "undo unlock command"]
diff --git a/Command/Map.hs b/Command/Map.hs
index 3fd6e42a1..ef8e04d90 100644
--- a/Command/Map.hs
+++ b/Command/Map.hs
@@ -19,7 +19,7 @@ import qualified Annex
import qualified Git
import Messages
import Types
-import Utility
+import Utility.SafeCommand
import UUID
import Trust
import Utility.Ssh
diff --git a/Command/Migrate.hs b/Command/Migrate.hs
index 5ae835440..25227ae16 100644
--- a/Command/Migrate.hs
+++ b/Command/Migrate.hs
@@ -20,7 +20,7 @@ import Locations
import Types
import Content
import Messages
-import Utility
+import Utility.Conditional
import qualified Command.Add
command :: [Command]
diff --git a/Command/RecvKey.hs b/Command/RecvKey.hs
index e2f7c74ab..be6163558 100644
--- a/Command/RecvKey.hs
+++ b/Command/RecvKey.hs
@@ -13,8 +13,8 @@ import System.Exit
import Command
import CmdLine
import Content
-import Utility
import Utility.RsyncFile
+import Utility.Conditional
command :: [Command]
command = [repoCommand "recvkey" paramKey seek
diff --git a/Command/SendKey.hs b/Command/SendKey.hs
index 02fedb349..f676ae947 100644
--- a/Command/SendKey.hs
+++ b/Command/SendKey.hs
@@ -14,8 +14,8 @@ import Locations
import qualified Annex
import Command
import Content
-import Utility
import Utility.RsyncFile
+import Utility.Conditional
import Messages
command :: [Command]
diff --git a/Command/SetKey.hs b/Command/SetKey.hs
index 807cbd5b9..2f6f9ea9e 100644
--- a/Command/SetKey.hs
+++ b/Command/SetKey.hs
@@ -10,7 +10,7 @@ module Command.SetKey where
import Control.Monad.State (liftIO)
import Command
-import Utility
+import Utility.SafeCommand
import LocationLog
import Content
import Messages
diff --git a/Command/Unannex.hs b/Command/Unannex.hs
index 960f99722..54ef2fc68 100644
--- a/Command/Unannex.hs
+++ b/Command/Unannex.hs
@@ -16,7 +16,8 @@ import Command
import qualified Command.Drop
import qualified Annex
import qualified AnnexQueue
-import Utility
+import Utility.SafeCommand
+import Utility.Path
import LocationLog
import Types
import Content
diff --git a/Command/Uninit.hs b/Command/Uninit.hs
index 195246aa8..fadae0e5a 100644
--- a/Command/Uninit.hs
+++ b/Command/Uninit.hs
@@ -12,7 +12,7 @@ import System.Directory
import System.Exit
import Command
-import Utility
+import Utility.SafeCommand
import qualified Git
import qualified Annex
import qualified Command.Unannex
diff --git a/Command/Unlock.hs b/Command/Unlock.hs
index 280eff9de..0daf1b321 100644
--- a/Command/Unlock.hs
+++ b/Command/Unlock.hs
@@ -16,8 +16,9 @@ import Types
import Messages
import Locations
import Content
+import Utility.Conditional
import Utility.CopyFile
-import Utility
+import Utility.Path
command :: [Command]
command =