summaryrefslogtreecommitdiff
path: root/CmdLine
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-01-20 16:36:33 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-01-20 16:36:33 -0400
commit10c579282b4f0acc7f26d8084916f7d538a89bd8 (patch)
treebc9e4a526b3bef0cb54b784cbe0d42a555a329db /CmdLine
parentd115fb8d3418d494708390f8a74938d830c669b7 (diff)
remove 163 lines of code without changing anything except imports
Diffstat (limited to 'CmdLine')
-rw-r--r--CmdLine/Action.hs2
-rw-r--r--CmdLine/Batch.hs7
-rw-r--r--CmdLine/GitAnnex/Options.hs3
-rw-r--r--CmdLine/GitAnnexShell.hs2
-rw-r--r--CmdLine/GitAnnexShell/Checks.hs2
-rw-r--r--CmdLine/GitAnnexShell/Fields.hs2
-rw-r--r--CmdLine/Option.hs2
-rw-r--r--CmdLine/Seek.hs3
-rw-r--r--CmdLine/Usage.hs2
9 files changed, 13 insertions, 12 deletions
diff --git a/CmdLine/Action.hs b/CmdLine/Action.hs
index b9fbf166e..ec31c32f0 100644
--- a/CmdLine/Action.hs
+++ b/CmdLine/Action.hs
@@ -9,7 +9,7 @@
module CmdLine.Action where
-import Common.Annex
+import Annex.Common
import qualified Annex
import Annex.Concurrent
import Types.Command
diff --git a/CmdLine/Batch.hs b/CmdLine/Batch.hs
index 0cbd3781d..cca93b0b3 100644
--- a/CmdLine/Batch.hs
+++ b/CmdLine/Batch.hs
@@ -7,8 +7,11 @@
module CmdLine.Batch where
-import Common.Annex
-import Command
+import Annex.Common
+import Types.Command
+import CmdLine.Action
+import CmdLine.GitAnnex.Options
+import Options.Applicative
data BatchMode = Batch | NoBatch
diff --git a/CmdLine/GitAnnex/Options.hs b/CmdLine/GitAnnex/Options.hs
index 7d8bcadee..81d6434e0 100644
--- a/CmdLine/GitAnnex/Options.hs
+++ b/CmdLine/GitAnnex/Options.hs
@@ -11,14 +11,13 @@ import Options.Applicative
import Options.Applicative.Builder.Internal
import Control.Concurrent
-import Common.Annex
+import Annex.Common
import qualified Git.Config
import qualified Git.Construct
import Git.Types
import Types.TrustLevel
import Types.NumCopies
import Types.Messages
-import Types.Key
import Types.Command
import Types.DeferredParse
import Types.DesktopNotify
diff --git a/CmdLine/GitAnnexShell.hs b/CmdLine/GitAnnexShell.hs
index 09108f879..599d12fec 100644
--- a/CmdLine/GitAnnexShell.hs
+++ b/CmdLine/GitAnnexShell.hs
@@ -7,7 +7,7 @@
module CmdLine.GitAnnexShell where
-import Common.Annex
+import Annex.Common
import qualified Git.Construct
import qualified Git.Config
import CmdLine
diff --git a/CmdLine/GitAnnexShell/Checks.hs b/CmdLine/GitAnnexShell/Checks.hs
index 5513d69cd..63d2e594f 100644
--- a/CmdLine/GitAnnexShell/Checks.hs
+++ b/CmdLine/GitAnnexShell/Checks.hs
@@ -7,7 +7,7 @@
module CmdLine.GitAnnexShell.Checks where
-import Common.Annex
+import Annex.Common
import Command
import qualified Annex
import Annex.Init
diff --git a/CmdLine/GitAnnexShell/Fields.hs b/CmdLine/GitAnnexShell/Fields.hs
index 1b76fc766..efe22971d 100644
--- a/CmdLine/GitAnnexShell/Fields.hs
+++ b/CmdLine/GitAnnexShell/Fields.hs
@@ -7,7 +7,7 @@
module CmdLine.GitAnnexShell.Fields where
-import Common.Annex
+import Annex.Common
import qualified Annex
import Git.FilePath
diff --git a/CmdLine/Option.hs b/CmdLine/Option.hs
index 4e201cbd4..b0fec3f09 100644
--- a/CmdLine/Option.hs
+++ b/CmdLine/Option.hs
@@ -9,7 +9,7 @@ module CmdLine.Option where
import Options.Applicative
-import Common.Annex
+import Annex.Common
import CmdLine.Usage
import CmdLine.GlobalSetter
import qualified Annex
diff --git a/CmdLine/Seek.hs b/CmdLine/Seek.hs
index be2bd22c3..30d47599a 100644
--- a/CmdLine/Seek.hs
+++ b/CmdLine/Seek.hs
@@ -11,9 +11,8 @@
module CmdLine.Seek where
-import Common.Annex
+import Annex.Common
import Types.Command
-import Types.Key
import Types.FileMatcher
import qualified Annex
import qualified Git
diff --git a/CmdLine/Usage.hs b/CmdLine/Usage.hs
index a6cc90a71..f66eb9153 100644
--- a/CmdLine/Usage.hs
+++ b/CmdLine/Usage.hs
@@ -7,7 +7,7 @@
module CmdLine.Usage where
-import Common.Annex
+import Annex.Common
import Types.Command
usageMessage :: String -> String