remove 163 lines of code without changing anything except imports

Command/Add.hs

@@ -7,7 +7,6 @@
 
 module Command.Add where
 
-import Common.Annex
 import Command
 import Annex.Ingest
 import Logs.Location
@@ -16,13 +15,11 @@ import Annex.Content.Direct
 import Annex.Link
 import qualified Annex
 import qualified Annex.Queue
+import qualified Database.Keys
 import Config
 import Utility.InodeCache
 import Annex.FileMatcher
 import Annex.Version
-import qualified Database.Keys
-import Types.Key
-import CmdLine.Batch
 
 cmd :: Command
 cmd = notBareRepo $ withGlobalOptions (jobsOption : jsonOption : fileMatchingOptions) $

Command/AddUnused.hs

@@ -7,12 +7,10 @@
 
 module Command.AddUnused where
 
-import Common.Annex
 import Logs.Location
 import Command
 import Annex.Ingest
 import Command.Unused (withUnusedMaps, UnusedMaps(..), startUnused)
-import Types.Key
 
 cmd :: Command
 cmd = notDirect $ 

Command/AddUrl.hs

@@ -11,7 +11,6 @@ module Command.AddUrl where
 
 import Network.URI
 
-import Common.Annex
 import Command
 import Backend
 import qualified Annex
@@ -25,7 +24,6 @@ import Annex.Content
 import Annex.Ingest
 import Annex.UUID
 import Logs.Web
-import Types.Key
 import Types.KeySource
 import Types.UrlContents
 import Config
@@ -33,7 +31,6 @@ import Annex.Content.Direct
 import Annex.FileMatcher
 import Logs.Location
 import Utility.Metered
-import CmdLine.Batch
 import qualified Annex.Transfer as Transfer
 #ifdef WITH_QUVI
 import Annex.Quvi

Command/Assistant.hs

@@ -7,7 +7,6 @@
 
 module Command.Assistant where
 
-import Common.Annex
 import Command
 import qualified Command.Watch
 import Annex.Init

Command/CheckPresentKey.hs

@@ -7,9 +7,7 @@
 
 module Command.CheckPresentKey where
 
-import Common.Annex
 import Command
-import Types.Key
 import qualified Remote
 import Annex
 import Types.Messages

Command/Commit.hs

@@ -7,7 +7,6 @@
 
 module Command.Commit where
 
-import Common.Annex
 import Command
 import qualified Annex.Branch
 import qualified Git

Command/ConfigList.hs

@@ -7,7 +7,6 @@
 
 module Command.ConfigList where
 
-import Common.Annex
 import Command
 import Annex.UUID
 import Annex.Init

Command/ContentLocation.hs

@@ -7,11 +7,8 @@
 
 module Command.ContentLocation where
 
-import Common.Annex
 import Command
-import CmdLine.Batch
 import Annex.Content
-import Types.Key
 
 cmd :: Command
 cmd = noCommit $ 

Command/Copy.hs

@@ -7,7 +7,6 @@
 
 module Command.Copy where
 
-import Common.Annex
 import Command
 import qualified Command.Move
 import qualified Remote

Command/Dead.hs

@@ -8,9 +8,7 @@
 module Command.Dead where
 
 import Command
-import Common.Annex
 import Types.TrustLevel
-import Types.Key
 import Command.Trust (trustCommand)
 import Logs.Location
 import Remote (keyLocations)

Command/Describe.hs

@@ -7,7 +7,6 @@
 
 module Command.Describe where
 
-import Common.Annex
 import Command
 import qualified Remote
 import Logs.UUID

Command/DiffDriver.hs

@@ -7,7 +7,6 @@
 
 module Command.DiffDriver where
 
-import Common.Annex
 import Command
 import Annex.Content
 import Annex.Link

Command/Direct.hs

@@ -7,7 +7,6 @@
 
 module Command.Direct where
 
-import Common.Annex
 import Command
 import qualified Git
 import qualified Git.LsFiles

Command/Drop.hs

@@ -7,7 +7,6 @@
 
 module Command.Drop where
 
-import Common.Annex
 import Command
 import qualified Remote
 import qualified Annex

Command/DropKey.hs

@@ -7,7 +7,6 @@
 
 module Command.DropKey where
 
-import Common.Annex
 import Command
 import qualified Annex
 import Logs.Location

Command/DropUnused.hs

@@ -7,7 +7,6 @@
 
 module Command.DropUnused where
 
-import Common.Annex
 import Command
 import qualified Command.Drop
 import qualified Remote

Command/EnableRemote.hs

@@ -7,7 +7,6 @@
 
 module Command.EnableRemote where
 
-import Common.Annex
 import Command
 import qualified Logs.Remote
 import qualified Types.Remote as R

Command/ExamineKey.hs

@@ -7,12 +7,9 @@
 
 module Command.ExamineKey where
 
-import Common.Annex
 import Command
-import CmdLine.Batch
 import qualified Utility.Format
 import Command.Find (parseFormatOption, showFormatted, keyVars)
-import Types.Key
 
 cmd :: Command
 cmd = noCommit $ withGlobalOptions [jsonOption] $

Command/Expire.hs

@@ -7,7 +7,6 @@
 
 module Command.Expire where
 
-import Common.Annex
 import Command
 import Logs.Activity
 import Logs.UUID

Command/Find.hs

@@ -10,14 +10,11 @@ module Command.Find where
 import Data.Default
 import qualified Data.Map as M
 
-import Common.Annex
 import Command
 import Annex.Content
 import Limit
 import qualified Utility.Format
 import Utility.DataUnits
-import Types.Key
-import CmdLine.Batch
 
 cmd :: Command
 cmd = withGlobalOptions annexedMatchingOptions $ mkCommand $

Command/FindRef.hs

@@ -7,7 +7,6 @@
 
 module Command.FindRef where
 
-import Common.Annex
 import Command
 import qualified Command.Find as Find
 

Command/Fix.hs

@@ -9,7 +9,6 @@
 
 module Command.Fix where
 
-import Common.Annex
 import Command
 import Config
 import qualified Annex

Command/Forget.hs

@@ -7,7 +7,6 @@
 
 module Command.Forget where
 
-import Common.Annex
 import Command
 import qualified Annex.Branch as Branch
 import Logs.Transitions

Command/FromKey.hs

@@ -9,11 +9,9 @@
 
 module Command.FromKey where
 
-import Common.Annex
 import Command
 import qualified Annex.Queue
 import Annex.Content
-import Types.Key
 import qualified Annex
 import qualified Backend.URL
 

Command/Fsck.hs

@@ -9,12 +9,10 @@
 
 module Command.Fsck where
 
-import Common.Annex
 import Command
 import qualified Annex
 import qualified Remote
 import qualified Types.Backend
-import qualified Types.Key
 import qualified Backend
 import Annex.Content
 import Annex.Content.Direct
@@ -29,7 +27,6 @@ import Annex.NumCopies
 import Annex.UUID
 import Utility.DataUnits
 import Config
-import Types.Key
 import Utility.HumanTime
 import Utility.CopyFile
 import Git.FilePath
@@ -177,7 +174,7 @@ performRemote key file backend numcopies remote =
 
 startKey :: Incremental -> Key -> NumCopies -> CommandStart
 startKey inc key numcopies =
-	case Backend.maybeLookupBackendName (Types.Key.keyBackendName key) of
+	case Backend.maybeLookupBackendName (keyBackendName key) of
 		Nothing -> stop
 		Just backend -> runFsck inc (key2file key) key $
 			performKey key backend numcopies
@@ -309,7 +306,7 @@ checkKeySizeRemote key remote (Just file) =
 	checkKeySizeOr (badContentRemote remote file) key file
 
 checkKeySizeOr :: (Key -> Annex String) -> Key -> FilePath -> Annex Bool
-checkKeySizeOr bad key file = case Types.Key.keySize key of
+checkKeySizeOr bad key file = case keySize key of
 	Nothing -> return True
 	Just size -> do
 		size' <- liftIO $ getFileSize file

Command/FuzzTest.hs

@@ -7,9 +7,8 @@
 
 module Command.FuzzTest where
 
-import Common.Annex
-import qualified Annex
 import Command
+import qualified Annex
 import qualified Git.Config
 import Config
 import Utility.ThreadScheduler

Command/GCryptSetup.hs

@@ -7,7 +7,6 @@
 
 module Command.GCryptSetup where
 
-import Common.Annex
 import Command
 import Annex.UUID
 import qualified Remote.GCrypt

Command/Get.hs

@@ -7,7 +7,6 @@
 
 module Command.Get where
 
-import Common.Annex
 import Command
 import qualified Remote
 import Annex.Content

Command/Group.hs

@@ -7,7 +7,6 @@
 
 module Command.Group where
 
-import Common.Annex
 import Command
 import qualified Remote
 import Logs.Group

Command/GroupWanted.hs

@@ -7,7 +7,6 @@
 
 module Command.GroupWanted where
 
-import Common.Annex
 import Command
 import Logs.PreferredContent
 import Command.Wanted (performGet, performSet)

Command/Help.hs

@@ -7,7 +7,6 @@
 
 module Command.Help where
 
-import Common.Annex
 import Command
 import qualified Command.Init
 import qualified Command.Add

Command/Import.hs

@@ -7,7 +7,6 @@
 
 module Command.Import where
 
-import Common.Annex
 import Command
 import qualified Git
 import qualified Annex
@@ -16,7 +15,6 @@ import Utility.CopyFile
 import Backend
 import Remote
 import Types.KeySource
-import Types.Key
 import Annex.CheckIgnore
 import Annex.NumCopies
 import Types.FileMatcher

Command/ImportFeed.hs

@@ -20,9 +20,8 @@ import Data.Time.Format
 import System.Locale
 #endif
 
-import Common.Annex
-import qualified Annex
 import Command
+import qualified Annex
 import qualified Annex.Url as Url
 import qualified Remote
 import qualified Types.Remote as Remote

Command/InAnnex.hs

@@ -7,7 +7,6 @@
 
 module Command.InAnnex where
 
-import Common.Annex
 import Command
 import Annex.Content
 

Command/Indirect.hs

@@ -7,7 +7,6 @@
 
 module Command.Indirect where
 
-import Common.Annex
 import Command
 import qualified Git
 import qualified Git.Branch

Command/Info.hs

@@ -14,16 +14,14 @@ import qualified Data.Map.Strict as M
 import Text.JSON
 import Data.Ord
 
-import Common.Annex
+import Command
 import qualified Git
 import qualified Annex
 import qualified Remote
 import qualified Types.Remote as Remote
-import Command
 import Utility.DataUnits
 import Utility.DiskFree
 import Annex.Content
-import Types.Key
 import Logs.UUID
 import Logs.Trust
 import Logs.Location
@@ -38,7 +36,6 @@ import qualified Limit
 import Messages.JSON (DualDisp(..))
 import Annex.BloomFilter
 import qualified Command.Unused
-import CmdLine.Batch
 
 -- a named computation that produces a statistic
 type Stat = StatState (Maybe (String, StatState String))

Command/Init.hs

@@ -7,7 +7,6 @@
 
 module Command.Init where
 
-import Common.Annex
 import Command
 import Annex.Init
 import Annex.Version

Command/InitRemote.hs

@@ -9,9 +9,8 @@ module Command.InitRemote where
 
 import qualified Data.Map as M
 
-import Common.Annex
-import Annex.SpecialRemote
 import Command
+import Annex.SpecialRemote
 import qualified Remote
 import qualified Logs.Remote
 import qualified Types.Remote as R

Command/List.hs

@@ -14,7 +14,6 @@ import Data.Function
 import Data.Tuple.Utils
 import Data.Ord
 
-import Common.Annex
 import Command
 import Remote
 import Logs.Trust

Command/Lock.hs

@@ -7,7 +7,6 @@
 
 module Command.Lock where
 
-import Common.Annex
 import Command
 import qualified Annex.Queue
 import qualified Annex

Command/LockContent.hs

@@ -7,10 +7,8 @@
 
 module Command.LockContent where
 
-import Common.Annex
 import Command
 import Annex.Content
-import Types.Key
 import Remote.Helper.Ssh (contentLockedMarker)
 
 cmd :: Command

Command/Log.hs

@@ -19,7 +19,6 @@ import Data.Time
 import System.Locale
 #endif
 
-import Common.Annex
 import Command
 import Logs
 import qualified Logs.Presence

Command/LookupKey.hs

@@ -7,11 +7,8 @@
 
 module Command.LookupKey where
 
-import Common.Annex
 import Command
-import CmdLine.Batch
 import Annex.CatFile
-import Types.Key
 
 cmd :: Command
 cmd = notBareRepo $ noCommit $

Command/Map.hs

@@ -9,7 +9,6 @@ module Command.Map where
 
 import qualified Data.Map as M
 
-import Common.Annex
 import Command
 import qualified Git
 import qualified Git.Url

Command/Merge.hs

@@ -7,7 +7,6 @@
 
 module Command.Merge where
 
-import Common.Annex
 import Command
 import qualified Annex.Branch
 import qualified Git.Branch

Command/MetaData.hs

@@ -7,7 +7,6 @@
 
 module Command.MetaData where
 
-import Common.Annex
 import Command
 import Annex.MetaData
 import Logs.MetaData

Command/Migrate.hs

@@ -7,10 +7,8 @@
 
 module Command.Migrate where
 
-import Common.Annex
 import Command
 import Backend
-import qualified Types.Key
 import Types.Backend (canUpgradeKey, fastMigrate)
 import Types.KeySource
 import Annex.Content
@@ -55,7 +53,7 @@ start file key = do
  -  - Something has changed in the backend, such as a bug fix.
  -}
 upgradableKey :: Backend -> Key -> Bool
-upgradableKey backend key = isNothing (Types.Key.keySize key) || backendupgradable
+upgradableKey backend key = isNothing (keySize key) || backendupgradable
   where
 	backendupgradable = maybe False (\a -> a key) (canUpgradeKey backend)
 

Command/Mirror.hs

@@ -7,7 +7,6 @@
 
 module Command.Mirror where
 
-import Common.Annex
 import Command
 import qualified Command.Move
 import qualified Command.Drop

Command/Move.hs

@@ -7,7 +7,6 @@
 
 module Command.Move where
 
-import Common.Annex
 import Command
 import qualified Command.Drop
 import qualified Annex

Command/NotifyChanges.hs

@@ -7,7 +7,6 @@
 
 module Command.NotifyChanges where
 
-import Common.Annex
 import Command
 import Utility.DirWatcher
 import Utility.DirWatcher.Types

Command/NumCopies.hs

@@ -7,9 +7,8 @@
 
 module Command.NumCopies where
 
-import Common.Annex
-import qualified Annex
 import Command
+import qualified Annex
 import Annex.NumCopies
 import Types.Messages
 

Command/PreCommit.hs

@@ -9,7 +9,6 @@
 
 module Command.PreCommit where
 
-import Common.Annex
 import Command
 import Config
 import qualified Command.Add

Command/Proxy.hs

@@ -7,7 +7,6 @@
 
 module Command.Proxy where
 
-import Common.Annex
 import Command
 import Config
 import Utility.Tmp

Command/ReKey.hs

@@ -7,10 +7,8 @@
 
 module Command.ReKey where
 
-import Common.Annex
 import Command
 import qualified Annex
-import Types.Key
 import Annex.Content
 import Annex.Ingest
 import Annex.Link

Command/ReadPresentKey.hs

@@ -7,10 +7,8 @@
 
 module Command.ReadPresentKey where
 
-import Common.Annex
 import Command
 import Logs.Location
-import Types.Key
 
 cmd :: Command
 cmd = noCommit $ 

Command/RecvKey.hs

@@ -7,7 +7,6 @@
 
 module Command.RecvKey where
 
-import Common.Annex
 import Command
 import Annex.Content
 import Annex.Action

Command/RegisterUrl.hs

@@ -9,7 +9,6 @@
 
 module Command.RegisterUrl where
 
-import Common.Annex
 import Command
 import Logs.Web
 import Command.FromKey (mkKey)

Command/Reinit.hs

@@ -7,11 +7,9 @@
 
 module Command.Reinit where
 
-import Common.Annex
 import Command
 import Annex.Init
 import Annex.UUID
-import Types.UUID
 import qualified Remote
 import qualified Annex.SpecialRemote
 	

Command/Reinject.hs

@@ -7,7 +7,6 @@
 
 module Command.Reinject where
 
-import Common.Annex
 import Command
 import Logs.Location
 import Annex.Content

Command/RemoteDaemon.hs

@@ -7,7 +7,6 @@
 
 module Command.RemoteDaemon where
 
-import Common.Annex
 import Command
 import RemoteDaemon.Core
 

Command/Repair.hs

@@ -7,7 +7,6 @@
 
 module Command.Repair where
 
-import Common.Annex
 import Command
 import qualified Annex
 import qualified Git.Repair

Command/ResolveMerge.hs

@@ -7,7 +7,6 @@
 
 module Command.ResolveMerge where
 
-import Common.Annex
 import Command
 import qualified Git
 import Git.Sha

Command/RmUrl.hs

@@ -7,7 +7,6 @@
 
 module Command.RmUrl where
 
-import Common.Annex
 import Command
 import Logs.Web
 import qualified Remote

Command/Schedule.hs

@@ -7,9 +7,8 @@
 
 module Command.Schedule where
 
-import Common.Annex
-import qualified Annex
 import Command
+import qualified Annex
 import qualified Remote
 import Logs.Schedule
 import Types.ScheduledActivity

Command/SendKey.hs

@@ -7,7 +7,6 @@
 
 module Command.SendKey where
 
-import Common.Annex
 import Command
 import Annex.Content
 import Annex

Command/SetKey.hs

@@ -7,11 +7,9 @@
 
 module Command.SetKey where
 
-import Common.Annex
 import Command
 import Logs.Location
 import Annex.Content
-import Types.Key
 
 cmd :: Command
 cmd = command "setkey" SectionPlumbing "sets annexed content for a key"

Command/SetPresentKey.hs

@@ -7,11 +7,9 @@
 
 module Command.SetPresentKey where
 
-import Common.Annex
 import Command
 import Logs.Location
 import Logs.Presence.Pure
-import Types.Key
 
 cmd :: Command
 cmd = noCommit $ 

Command/Smudge.hs

@@ -7,7 +7,6 @@
 
 module Command.Smudge where
 
-import Common.Annex
 import Command
 import Annex.Content
 import Annex.Link

Command/Status.hs

@@ -7,7 +7,6 @@
 
 module Command.Status where
 
-import Common.Annex
 import Command
 import Annex.CatFile
 import Annex.Content.Direct

Command/Sync.hs

@@ -19,7 +19,6 @@ module Command.Sync (
 	updateSyncBranch,
 ) where
 
-import Common.Annex
 import Command
 import qualified Annex
 import qualified Annex.Branch

Command/Test.hs

@@ -7,9 +7,7 @@
 
 module Command.Test where
 
-import Common
 import Command
-import Messages
 import Types.Test
 
 cmd :: Parser TestOptions -> Maybe TestRunner -> Command

Command/TestRemote.hs

@@ -7,13 +7,10 @@
 
 module Command.TestRemote where
 
-import Common
 import Command
 import qualified Annex
 import qualified Remote
 import qualified Types.Remote as Remote
-import Types
-import Types.Key (key2file, keyBackendName, keySize)
 import Types.Backend (getKey, verifyKeyContent)
 import Types.KeySource
 import Annex.Content
@@ -23,10 +20,8 @@ import Utility.Tmp
 import Utility.Metered
 import Utility.DataUnits
 import Utility.CopyFile
-import Messages
 import Types.Messages
 import Remote.Helper.Chunked
-import Locations
 import Git.Types
 
 import Test.Tasty

Command/TransferInfo.hs

@@ -7,11 +7,9 @@
 
 module Command.TransferInfo where
 
-import Common.Annex
 import Command
 import Annex.Content
 import Logs.Transfer
-import Types.Key
 import qualified CmdLine.GitAnnexShell.Fields as Fields
 import Utility.Metered
 

Command/TransferKey.hs

@@ -7,7 +7,6 @@
 
 module Command.TransferKey where
 
-import Common.Annex
 import Command
 import Annex.Content
 import Logs.Location

Command/TransferKeys.hs

@@ -9,13 +9,11 @@
 
 module Command.TransferKeys where
 
-import Common.Annex
 import Command
 import Annex.Content
 import Logs.Location
 import Annex.Transfer
 import qualified Remote
-import Types.Key
 import Utility.SimpleProtocol (dupIoHandles)
 import Git.Types (RemoteName)
 

Command/Trust.hs

@@ -7,7 +7,6 @@
 
 module Command.Trust where
 
-import Common.Annex
 import Command
 import qualified Remote
 import Types.TrustLevel

Command/Unannex.hs

@@ -9,7 +9,6 @@
 
 module Command.Unannex where
 
-import Common.Annex
 import Command
 import Config
 import qualified Annex

Command/Undo.hs

@@ -7,7 +7,6 @@
 
 module Command.Undo where
 
-import Common.Annex
 import Command
 import Config
 import Annex.Direct

Command/Ungroup.hs

@@ -7,7 +7,6 @@
 
 module Command.Ungroup where
 
-import Common.Annex
 import Command
 import qualified Remote
 import Logs.Group

Command/Uninit.hs

@@ -7,9 +7,8 @@
 
 module Command.Uninit where
 
-import Common.Annex
-import qualified Annex
 import Command
+import qualified Annex
 import qualified Git
 import qualified Git.Command
 import qualified Command.Unannex

Command/Unlock.hs

@@ -7,7 +7,6 @@
 
 module Command.Unlock where
 
-import Common.Annex
 import Command
 import Annex.Content
 import Annex.CatFile

Command/Unused.hs

@@ -11,7 +11,6 @@ module Command.Unused where
 
 import qualified Data.Map as M
 
-import Common.Annex
 import Command
 import Logs.Unused
 import Annex.Content
@@ -28,7 +27,6 @@ import qualified Remote
 import qualified Annex.Branch
 import Annex.Link
 import Annex.CatFile
-import Types.Key
 import Types.RefSpec
 import Git.Types
 import Git.Sha

Command/Upgrade.hs

@@ -7,7 +7,6 @@
 
 module Command.Upgrade where
 
-import Common.Annex
 import Command
 import Upgrade
 

Command/VAdd.hs

@@ -7,7 +7,6 @@
 
 module Command.VAdd where
 
-import Common.Annex
 import Command
 import Annex.View
 import Command.View (checkoutViewBranch)

Command/VCycle.hs

@@ -7,7 +7,6 @@
 
 module Command.VCycle where
 
-import Common.Annex
 import Command
 import Annex.View
 import Types.View

Command/VFilter.hs

@@ -7,7 +7,6 @@
 
 module Command.VFilter where
 
-import Common.Annex
 import Command
 import Annex.View
 import Command.View (paramView, checkoutViewBranch)

Command/VPop.hs

@@ -7,7 +7,6 @@
 
 module Command.VPop where
 
-import Common.Annex
 import Command
 import qualified Git
 import qualified Git.Command

Command/Version.hs

@@ -7,7 +7,6 @@
 
 module Command.Version where
 
-import Common.Annex
 import Command
 import qualified Build.SysConfig as SysConfig
 import Annex.Version

Command/Vicfg.hs

@@ -16,7 +16,6 @@ import Data.Tuple (swap)
 import Data.Char (isSpace)
 import Data.Default
 
-import Common.Annex
 import Command
 import Annex.Perms
 import Types.TrustLevel

Command/View.hs

@@ -7,7 +7,6 @@
 
 module Command.View where
 
-import Common.Annex
 import Command
 import qualified Git
 import qualified Git.Command

Command/Wanted.hs

@@ -7,9 +7,8 @@
 
 module Command.Wanted where
 
-import Common.Annex
-import qualified Annex
 import Command
+import qualified Annex
 import qualified Remote
 import Logs.PreferredContent
 import Types.Messages

Command/Watch.hs

@@ -7,9 +7,8 @@
 
 module Command.Watch where
 
-import Common.Annex
-import Assistant
 import Command
+import Assistant
 import Utility.HumanTime
 
 cmd :: Command

Command/WebApp.hs

@@ -9,7 +9,6 @@
 
 module Command.WebApp where
 
-import Common.Annex
 import Command
 import Assistant
 import Assistant.Common

Command/Whereis.hs

@@ -7,14 +7,12 @@
 
 module Command.Whereis where
 
-import Common.Annex
 import Command
 import Remote
 import Logs.Trust
 import Logs.Web
 import Remote.Web (getWebUrls)
 import Annex.UUID
-import CmdLine.Batch
 
 import qualified Data.Map as M
 

Command/XMPPGit.hs

@@ -7,7 +7,6 @@
 
 module Command.XMPPGit where
 
-import Common.Annex
 import Command
 import Assistant.XMPP.Git