summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-10-04 00:40:47 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-10-04 00:59:08 -0400
commitcfe21e85e7fba61ac588e210f2a9b75f8d081f42 (patch)
tree3237aa5460cb38254a44a6462c83db3c2276c229 /Command
parentff21fd4a652cc6516d0e06ab885adf1c93eddced (diff)
rename
Diffstat (limited to 'Command')
-rw-r--r--Command/Add.hs10
-rw-r--r--Command/AddUrl.hs4
-rw-r--r--Command/ConfigList.hs2
-rw-r--r--Command/Describe.hs2
-rw-r--r--Command/Drop.hs4
-rw-r--r--Command/DropKey.hs4
-rw-r--r--Command/DropUnused.hs2
-rw-r--r--Command/Find.hs4
-rw-r--r--Command/Fix.hs8
-rw-r--r--Command/FromKey.hs8
-rw-r--r--Command/Fsck.hs4
-rw-r--r--Command/Get.hs4
-rw-r--r--Command/InAnnex.hs4
-rw-r--r--Command/Init.hs2
-rw-r--r--Command/InitRemote.hs2
-rw-r--r--Command/Lock.hs6
-rw-r--r--Command/Map.hs2
-rw-r--r--Command/Merge.hs6
-rw-r--r--Command/Migrate.hs4
-rw-r--r--Command/Move.hs4
-rw-r--r--Command/RecvKey.hs4
-rw-r--r--Command/Semitrust.hs2
-rw-r--r--Command/SendKey.hs4
-rw-r--r--Command/SetKey.hs4
-rw-r--r--Command/Status.hs4
-rw-r--r--Command/Trust.hs2
-rw-r--r--Command/Unannex.hs8
-rw-r--r--Command/Uninit.hs8
-rw-r--r--Command/Unlock.hs4
-rw-r--r--Command/Untrust.hs2
-rw-r--r--Command/Unused.hs10
-rw-r--r--Command/Upgrade.hs4
-rw-r--r--Command/Version.hs4
-rw-r--r--Command/Whereis.hs2
34 files changed, 74 insertions, 74 deletions
diff --git a/Command/Add.hs b/Command/Add.hs
index 299b5f36e..70b38e809 100644
--- a/Command/Add.hs
+++ b/Command/Add.hs
@@ -7,14 +7,14 @@
module Command.Add where
-import AnnexCommon
+import Annex.Common
import Annex.Exception
import Command
import qualified Annex
-import qualified AnnexQueue
+import qualified Annex.Queue
import qualified Backend
import LocationLog
-import Content
+import Annex.Content
import Utility.Touch
import Backend
@@ -81,6 +81,6 @@ cleanup file key hascontent = do
force <- Annex.getState Annex.force
if force
- then AnnexQueue.add "add" [Param "-f", Param "--"] [file]
- else AnnexQueue.add "add" [Param "--"] [file]
+ then Annex.Queue.add "add" [Param "-f", Param "--"] [file]
+ else Annex.Queue.add "add" [Param "--"] [file]
return True
diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs
index ce6e70699..35f85ca26 100644
--- a/Command/AddUrl.hs
+++ b/Command/AddUrl.hs
@@ -9,7 +9,7 @@ module Command.AddUrl where
import Network.URI
-import AnnexCommon
+import Annex.Common
import Command
import qualified Backend
import qualified Utility.Url as Url
@@ -17,7 +17,7 @@ import qualified Remote.Web
import qualified Command.Add
import qualified Annex
import qualified Backend.URL
-import Content
+import Annex.Content
import PresenceLog
command :: [Command]
diff --git a/Command/ConfigList.hs b/Command/ConfigList.hs
index c38539fa0..443656f17 100644
--- a/Command/ConfigList.hs
+++ b/Command/ConfigList.hs
@@ -7,7 +7,7 @@
module Command.ConfigList where
-import AnnexCommon
+import Annex.Common
import Command
import UUID
diff --git a/Command/Describe.hs b/Command/Describe.hs
index b1c144872..48f74dcd8 100644
--- a/Command/Describe.hs
+++ b/Command/Describe.hs
@@ -7,7 +7,7 @@
module Command.Describe where
-import AnnexCommon
+import Annex.Common
import Command
import qualified Remote
import UUID
diff --git a/Command/Drop.hs b/Command/Drop.hs
index 7210184f8..45feab2f3 100644
--- a/Command/Drop.hs
+++ b/Command/Drop.hs
@@ -7,12 +7,12 @@
module Command.Drop where
-import AnnexCommon
+import Annex.Common
import Command
import qualified Remote
import qualified Annex
import LocationLog
-import Content
+import Annex.Content
import Trust
import Config
diff --git a/Command/DropKey.hs b/Command/DropKey.hs
index 7ead1c4bc..185041ad0 100644
--- a/Command/DropKey.hs
+++ b/Command/DropKey.hs
@@ -7,11 +7,11 @@
module Command.DropKey where
-import AnnexCommon
+import Annex.Common
import Command
import qualified Annex
import LocationLog
-import Content
+import Annex.Content
command :: [Command]
command = [repoCommand "dropkey" (paramRepeating paramKey) seek
diff --git a/Command/DropUnused.hs b/Command/DropUnused.hs
index ed4f71e7e..c4d9b765e 100644
--- a/Command/DropUnused.hs
+++ b/Command/DropUnused.hs
@@ -9,7 +9,7 @@ module Command.DropUnused where
import qualified Data.Map as M
-import AnnexCommon
+import Annex.Common
import Command
import qualified Annex
import qualified Command.Drop
diff --git a/Command/Find.hs b/Command/Find.hs
index 8d80659d0..b8c9eeec2 100644
--- a/Command/Find.hs
+++ b/Command/Find.hs
@@ -7,9 +7,9 @@
module Command.Find where
-import AnnexCommon
+import Annex.Common
import Command
-import Content
+import Annex.Content
import Limit
command :: [Command]
diff --git a/Command/Fix.hs b/Command/Fix.hs
index a66a1c44a..44e36009b 100644
--- a/Command/Fix.hs
+++ b/Command/Fix.hs
@@ -7,10 +7,10 @@
module Command.Fix where
-import AnnexCommon
+import Annex.Common
import Command
-import qualified AnnexQueue
-import Content
+import qualified Annex.Queue
+import Annex.Content
command :: [Command]
command = [repoCommand "fix" paramPaths seek
@@ -39,5 +39,5 @@ perform file link = do
cleanup :: FilePath -> CommandCleanup
cleanup file = do
- AnnexQueue.add "add" [Param "--"] [file]
+ Annex.Queue.add "add" [Param "--"] [file]
return True
diff --git a/Command/FromKey.hs b/Command/FromKey.hs
index e60025bf7..f4dceb331 100644
--- a/Command/FromKey.hs
+++ b/Command/FromKey.hs
@@ -7,10 +7,10 @@
module Command.FromKey where
-import AnnexCommon
+import Annex.Common
import Command
-import qualified AnnexQueue
-import Content
+import qualified Annex.Queue
+import Annex.Content
import Types.Key
command :: [Command]
@@ -39,5 +39,5 @@ perform file = do
cleanup :: FilePath -> CommandCleanup
cleanup file = do
- AnnexQueue.add "add" [Param "--"] [file]
+ Annex.Queue.add "add" [Param "--"] [file]
return True
diff --git a/Command/Fsck.hs b/Command/Fsck.hs
index 33a8405a6..0a7500320 100644
--- a/Command/Fsck.hs
+++ b/Command/Fsck.hs
@@ -7,13 +7,13 @@
module Command.Fsck where
-import AnnexCommon
+import Annex.Common
import Command
import qualified Remote
import qualified Types.Backend
import qualified Types.Key
import UUID
-import Content
+import Annex.Content
import LocationLog
import Trust
import Utility.DataUnits
diff --git a/Command/Get.hs b/Command/Get.hs
index 34f56aa2d..c9fdf5653 100644
--- a/Command/Get.hs
+++ b/Command/Get.hs
@@ -7,11 +7,11 @@
module Command.Get where
-import AnnexCommon
+import Annex.Common
import Command
import qualified Annex
import qualified Remote
-import Content
+import Annex.Content
import qualified Command.Move
command :: [Command]
diff --git a/Command/InAnnex.hs b/Command/InAnnex.hs
index 36b6d40e6..05544366b 100644
--- a/Command/InAnnex.hs
+++ b/Command/InAnnex.hs
@@ -7,9 +7,9 @@
module Command.InAnnex where
-import AnnexCommon
+import Annex.Common
import Command
-import Content
+import Annex.Content
command :: [Command]
command = [repoCommand "inannex" (paramRepeating paramKey) seek
diff --git a/Command/Init.hs b/Command/Init.hs
index f3d8834ba..1a306ae96 100644
--- a/Command/Init.hs
+++ b/Command/Init.hs
@@ -7,7 +7,7 @@
module Command.Init where
-import AnnexCommon
+import Annex.Common
import Command
import UUID
import Init
diff --git a/Command/InitRemote.hs b/Command/InitRemote.hs
index 2ce86e9c6..5080b7b2b 100644
--- a/Command/InitRemote.hs
+++ b/Command/InitRemote.hs
@@ -9,7 +9,7 @@ module Command.InitRemote where
import qualified Data.Map as M
-import AnnexCommon
+import Annex.Common
import Command
import qualified Remote
import qualified RemoteLog
diff --git a/Command/Lock.hs b/Command/Lock.hs
index af7b92ad6..9acc5fe4a 100644
--- a/Command/Lock.hs
+++ b/Command/Lock.hs
@@ -7,9 +7,9 @@
module Command.Lock where
-import AnnexCommon
+import Annex.Common
import Command
-import qualified AnnexQueue
+import qualified Annex.Queue
import Backend
command :: [Command]
@@ -30,5 +30,5 @@ perform file = do
-- Checkout from HEAD to get rid of any changes that might be
-- staged in the index, and get back to the previous symlink to
-- the content.
- AnnexQueue.add "checkout" [Param "HEAD", Param "--"] [file]
+ Annex.Queue.add "checkout" [Param "HEAD", Param "--"] [file]
next $ return True -- no cleanup needed
diff --git a/Command/Map.hs b/Command/Map.hs
index 8e63f6dd6..39737289c 100644
--- a/Command/Map.hs
+++ b/Command/Map.hs
@@ -10,7 +10,7 @@ module Command.Map where
import Control.Exception.Extensible
import qualified Data.Map as M
-import AnnexCommon
+import Annex.Common
import Command
import qualified Git
import UUID
diff --git a/Command/Merge.hs b/Command/Merge.hs
index b365e0e0c..1de1eb6ee 100644
--- a/Command/Merge.hs
+++ b/Command/Merge.hs
@@ -7,9 +7,9 @@
module Command.Merge where
-import AnnexCommon
+import Annex.Common
import Command
-import qualified Branch
+import qualified Annex.Branch
command :: [Command]
command = [repoCommand "merge" paramNothing seek
@@ -25,5 +25,5 @@ start = do
perform :: CommandPerform
perform = do
- Branch.update
+ Annex.Branch.update
next $ return True
diff --git a/Command/Migrate.hs b/Command/Migrate.hs
index 24f23baf5..a9591a81a 100644
--- a/Command/Migrate.hs
+++ b/Command/Migrate.hs
@@ -7,11 +7,11 @@
module Command.Migrate where
-import AnnexCommon
+import Annex.Common
import Command
import qualified Backend
import qualified Types.Key
-import Content
+import Annex.Content
import qualified Command.Add
import Backend
diff --git a/Command/Move.hs b/Command/Move.hs
index d2870b1e4..06d58d602 100644
--- a/Command/Move.hs
+++ b/Command/Move.hs
@@ -7,12 +7,12 @@
module Command.Move where
-import AnnexCommon
+import Annex.Common
import Command
import qualified Command.Drop
import qualified Annex
import LocationLog
-import Content
+import Annex.Content
import qualified Remote
import UUID
diff --git a/Command/RecvKey.hs b/Command/RecvKey.hs
index 400e81102..babe04cd0 100644
--- a/Command/RecvKey.hs
+++ b/Command/RecvKey.hs
@@ -7,10 +7,10 @@
module Command.RecvKey where
-import AnnexCommon
+import Annex.Common
import Command
import CmdLine
-import Content
+import Annex.Content
import Utility.RsyncFile
command :: [Command]
diff --git a/Command/Semitrust.hs b/Command/Semitrust.hs
index 236ba2879..31b44bc59 100644
--- a/Command/Semitrust.hs
+++ b/Command/Semitrust.hs
@@ -7,7 +7,7 @@
module Command.Semitrust where
-import AnnexCommon
+import Annex.Common
import Command
import qualified Remote
import UUID
diff --git a/Command/SendKey.hs b/Command/SendKey.hs
index f397d9ae6..f3db99663 100644
--- a/Command/SendKey.hs
+++ b/Command/SendKey.hs
@@ -7,9 +7,9 @@
module Command.SendKey where
-import AnnexCommon
+import Annex.Common
import Command
-import Content
+import Annex.Content
import Utility.RsyncFile
command :: [Command]
diff --git a/Command/SetKey.hs b/Command/SetKey.hs
index 12ef5b74a..dde1ec12a 100644
--- a/Command/SetKey.hs
+++ b/Command/SetKey.hs
@@ -7,10 +7,10 @@
module Command.SetKey where
-import AnnexCommon
+import Annex.Common
import Command
import LocationLog
-import Content
+import Annex.Content
command :: [Command]
command = [repoCommand "setkey" paramPath seek
diff --git a/Command/Status.hs b/Command/Status.hs
index de49f84d5..edb74166d 100644
--- a/Command/Status.hs
+++ b/Command/Status.hs
@@ -12,7 +12,7 @@ import qualified Data.Map as M
import qualified Data.Set as S
import Data.Set (Set)
-import AnnexCommon
+import Annex.Common
import qualified Types.Backend as B
import qualified Types.Remote as R
import qualified Remote
@@ -20,7 +20,7 @@ import qualified Command.Unused
import qualified Git
import Command
import Utility.DataUnits
-import Content
+import Annex.Content
import Types.Key
import Backend
import UUID
diff --git a/Command/Trust.hs b/Command/Trust.hs
index 04c68a5d3..3c3473e21 100644
--- a/Command/Trust.hs
+++ b/Command/Trust.hs
@@ -7,7 +7,7 @@
module Command.Trust where
-import AnnexCommon
+import Annex.Common
import Command
import qualified Remote
import Trust
diff --git a/Command/Unannex.hs b/Command/Unannex.hs
index c5c5e90a6..9413cb88c 100644
--- a/Command/Unannex.hs
+++ b/Command/Unannex.hs
@@ -7,14 +7,14 @@
module Command.Unannex where
-import AnnexCommon
+import Annex.Common
import Command
import qualified Command.Drop
import qualified Annex
-import qualified AnnexQueue
+import qualified Annex.Queue
import Utility.FileMode
import LocationLog
-import Content
+import Annex.Content
import qualified Git
import qualified Git.LsFiles as LsFiles
@@ -71,6 +71,6 @@ cleanup file key = do
-- Commit staged changes at end to avoid confusing the
-- pre-commit hook if this file is later added back to
-- git as a normal, non-annexed file.
- AnnexQueue.add "commit" [Param "-m", Param "content removed from git annex"] []
+ Annex.Queue.add "commit" [Param "-m", Param "content removed from git annex"] []
return True
diff --git a/Command/Uninit.hs b/Command/Uninit.hs
index 3ba7a7cf3..c5afe30f2 100644
--- a/Command/Uninit.hs
+++ b/Command/Uninit.hs
@@ -7,14 +7,14 @@
module Command.Uninit where
-import AnnexCommon
+import Annex.Common
import Command
import qualified Git
import qualified Annex
import qualified Command.Unannex
import Init
-import qualified Branch
-import Content
+import qualified Annex.Branch
+import Annex.Content
command :: [Command]
command = [repoCommand "uninit" paramPaths seek
@@ -46,5 +46,5 @@ cleanup = do
-- avoid normal shutdown
saveState
liftIO $ do
- Git.run g "branch" [Param "-D", Param Branch.name]
+ Git.run g "branch" [Param "-D", Param Annex.Branch.name]
exitSuccess
diff --git a/Command/Unlock.hs b/Command/Unlock.hs
index 220d57829..b2e4aa09a 100644
--- a/Command/Unlock.hs
+++ b/Command/Unlock.hs
@@ -7,9 +7,9 @@
module Command.Unlock where
-import AnnexCommon
+import Annex.Common
import Command
-import Content
+import Annex.Content
import Utility.CopyFile
import Utility.FileMode
diff --git a/Command/Untrust.hs b/Command/Untrust.hs
index 30ade85ce..b8a107d90 100644
--- a/Command/Untrust.hs
+++ b/Command/Untrust.hs
@@ -7,7 +7,7 @@
module Command.Untrust where
-import AnnexCommon
+import Annex.Common
import Command
import qualified Remote
import UUID
diff --git a/Command/Unused.hs b/Command/Unused.hs
index 1ba4f5301..6681fca3c 100644
--- a/Command/Unused.hs
+++ b/Command/Unused.hs
@@ -12,9 +12,9 @@ module Command.Unused where
import qualified Data.Set as S
import qualified Data.ByteString.Lazy.Char8 as L
-import AnnexCommon
+import Annex.Common
import Command
-import Content
+import Annex.Content
import Utility.FileMode
import LocationLog
import qualified Annex
@@ -23,8 +23,8 @@ import qualified Git.LsFiles as LsFiles
import qualified Git.LsTree as LsTree
import qualified Backend
import qualified Remote
-import qualified Branch
-import CatFile
+import qualified Annex.Branch
+import Annex.CatFile
command :: [Command]
command = [repoCommand "unused" paramNothing seek
@@ -165,7 +165,7 @@ excludeReferenced l = do
filter ourbranches .
map words . lines . L.unpack
cmpheads a b = head a == head b
- ourbranchend = '/' : Branch.name
+ ourbranchend = '/' : Annex.Branch.name
ourbranches ws = not $ ourbranchend `isSuffixOf` last ws
removewith [] s = return $ S.toList s
removewith (a:as) s
diff --git a/Command/Upgrade.hs b/Command/Upgrade.hs
index d79f895d8..7b6b127a5 100644
--- a/Command/Upgrade.hs
+++ b/Command/Upgrade.hs
@@ -7,10 +7,10 @@
module Command.Upgrade where
-import AnnexCommon
+import Annex.Common
import Command
import Upgrade
-import Version
+import Annex.Version
command :: [Command]
command = [standaloneCommand "upgrade" paramNothing seek
diff --git a/Command/Version.hs b/Command/Version.hs
index 1e44fbb0b..bc895b194 100644
--- a/Command/Version.hs
+++ b/Command/Version.hs
@@ -7,10 +7,10 @@
module Command.Version where
-import AnnexCommon
+import Annex.Common
import Command
import qualified Build.SysConfig as SysConfig
-import Version
+import Annex.Version
command :: [Command]
command = [standaloneCommand "version" paramNothing seek "show version info"]
diff --git a/Command/Whereis.hs b/Command/Whereis.hs
index 3fb636c04..fec41f410 100644
--- a/Command/Whereis.hs
+++ b/Command/Whereis.hs
@@ -7,7 +7,7 @@
module Command.Whereis where
-import AnnexCommon
+import Annex.Common
import LocationLog
import Command
import Remote
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 10:59:48 +0000