remove 163 lines of code without changing anything except imports

27 files changed, 27 insertions, 29 deletions

diff --git a/Logs/Activity.hs b/Logs/Activity.hs
index 9738fdb1c..6f5bf0deb 100644
--- a/Logs/Activity.hs
+++ b/Logs/Activity.hs
@@ -14,7 +14,7 @@ module Logs.Activity (
 
 import Data.Time.Clock.POSIX
 
-import Common.Annex
+import Annex.Common
 import qualified Annex.Branch
 import Logs
 import Logs.UUIDBased
diff --git a/Logs/Chunk.hs b/Logs/Chunk.hs
index 8f0e7cedb..b591a2a6d 100644
--- a/Logs/Chunk.hs
+++ b/Logs/Chunk.hs
@@ -24,7 +24,7 @@ module Logs.Chunk (
 	getCurrentChunks,
 ) where
 
-import Common.Annex
+import Annex.Common
 import Logs
 import Logs.MapLog
 import qualified Annex.Branch
diff --git a/Logs/Chunk/Pure.hs b/Logs/Chunk/Pure.hs
index af209d7e1..7fbadb623 100644
--- a/Logs/Chunk/Pure.hs
+++ b/Logs/Chunk/Pure.hs
@@ -14,7 +14,7 @@ module Logs.Chunk.Pure
 	, showLog
 	) where
 
-import Common.Annex
+import Annex.Common
 import Logs.MapLog
 import Data.Int
 
diff --git a/Logs/Difference.hs b/Logs/Difference.hs
index fd93fc3cf..9817393e3 100644
--- a/Logs/Difference.hs
+++ b/Logs/Difference.hs
@@ -15,7 +15,7 @@ module Logs.Difference (
 import Data.Time.Clock.POSIX
 import qualified Data.Map as M
 
-import Common.Annex
+import Annex.Common
 import Types.Difference
 import qualified Annex.Branch
 import Logs
diff --git a/Logs/Difference/Pure.hs b/Logs/Difference/Pure.hs
index 0e68ffd3c..78a11d71f 100644
--- a/Logs/Difference/Pure.hs
+++ b/Logs/Difference/Pure.hs
@@ -12,7 +12,7 @@ module Logs.Difference.Pure (
 
 import qualified Data.Map as M
 
-import Common.Annex
+import Annex.Common
 import Types.Difference
 import Logs.UUIDBased
 
diff --git a/Logs/FsckResults.hs b/Logs/FsckResults.hs
index e6db9a076..09430e806 100644
--- a/Logs/FsckResults.hs
+++ b/Logs/FsckResults.hs
@@ -11,7 +11,7 @@ module Logs.FsckResults (
 	clearFsckResults,
 ) where
 
-import Common.Annex
+import Annex.Common
 import Utility.Tmp
 import Git.Fsck
 import Git.Types
diff --git a/Logs/Group.hs b/Logs/Group.hs
index 3725c046c..7090e7b45 100644
--- a/Logs/Group.hs
+++ b/Logs/Group.hs
@@ -20,7 +20,7 @@ import qualified Data.Map as M
 import qualified Data.Set as S
 import Data.Time.Clock.POSIX
 
-import Common.Annex
+import Annex.Common
 import Logs
 import qualified Annex.Branch
 import qualified Annex
diff --git a/Logs/Location.hs b/Logs/Location.hs
index 89100805b..2698d7f95 100644
--- a/Logs/Location.hs
+++ b/Logs/Location.hs
@@ -25,7 +25,7 @@ module Logs.Location (
 	loggedKeysFor,
 ) where
 
-import Common.Annex
+import Annex.Common
 import qualified Annex.Branch
 import Logs
 import Logs.Presence
diff --git a/Logs/MetaData.hs b/Logs/MetaData.hs
index 8bc030dc6..52370d2c5 100644
--- a/Logs/MetaData.hs
+++ b/Logs/MetaData.hs
@@ -33,7 +33,7 @@ module Logs.MetaData (
 	copyMetaData,
 ) where
 
-import Common.Annex
+import Annex.Common
 import Types.MetaData
 import Annex.MetaData.StandardFields
 import qualified Annex.Branch
diff --git a/Logs/NumCopies.hs b/Logs/NumCopies.hs
index 3fc29c2f2..a4bca5b07 100644
--- a/Logs/NumCopies.hs
+++ b/Logs/NumCopies.hs
@@ -13,7 +13,7 @@ module Logs.NumCopies (
 	globalNumCopiesLoad,
 ) where
 
-import Common.Annex
+import Annex.Common
 import qualified Annex
 import Types.NumCopies
 import Logs
diff --git a/Logs/PreferredContent.hs b/Logs/PreferredContent.hs
index 035c098f6..712973ee4 100644
--- a/Logs/PreferredContent.hs
+++ b/Logs/PreferredContent.hs
@@ -27,7 +27,7 @@ import qualified Data.Map as M
 import qualified Data.Set as S
 import Data.Either
 
-import Common.Annex
+import Annex.Common
 import Logs.PreferredContent.Raw
 import qualified Annex.Branch
 import qualified Annex
diff --git a/Logs/PreferredContent/Raw.hs b/Logs/PreferredContent/Raw.hs
index 119261ab8..e23b09c55 100644
--- a/Logs/PreferredContent/Raw.hs
+++ b/Logs/PreferredContent/Raw.hs
@@ -10,7 +10,7 @@ module Logs.PreferredContent.Raw where
 import qualified Data.Map as M
 import Data.Time.Clock.POSIX
 
-import Common.Annex
+import Annex.Common
 import qualified Annex.Branch
 import qualified Annex
 import Logs
diff --git a/Logs/Presence.hs b/Logs/Presence.hs
index f90253421..29b786e5e 100644
--- a/Logs/Presence.hs
+++ b/Logs/Presence.hs
@@ -25,7 +25,7 @@ module Logs.Presence (
 import Data.Time.Clock.POSIX
 
 import Logs.Presence.Pure as X
-import Common.Annex
+import Annex.Common
 import qualified Annex.Branch
 import Git.Types (RefDate)
 
diff --git a/Logs/Presence/Pure.hs b/Logs/Presence/Pure.hs
index 4e5ff68c0..e2ec3f13d 100644
--- a/Logs/Presence/Pure.hs
+++ b/Logs/Presence/Pure.hs
@@ -10,7 +10,7 @@ module Logs.Presence.Pure where
 import Data.Time.Clock.POSIX
 import qualified Data.Map as M
 
-import Common.Annex
+import Annex.Common
 import Logs.TimeStamp
 import Utility.QuickCheck
 
diff --git a/Logs/Remote.hs b/Logs/Remote.hs
index a90eb027c..1eb1c41b1 100644
--- a/Logs/Remote.hs
+++ b/Logs/Remote.hs
@@ -22,7 +22,7 @@ import qualified Data.Map as M
 import Data.Time.Clock.POSIX
 import Data.Char
 
-import Common.Annex
+import Annex.Common
 import qualified Annex.Branch
 import Types.Remote
 import Logs
diff --git a/Logs/RemoteState.hs b/Logs/RemoteState.hs
index b302b739a..ff4979f9c 100644
--- a/Logs/RemoteState.hs
+++ b/Logs/RemoteState.hs
@@ -10,7 +10,7 @@ module Logs.RemoteState (
 	setRemoteState,
 ) where
 
-import Common.Annex
+import Annex.Common
 import Logs
 import Logs.UUIDBased
 import qualified Annex.Branch
diff --git a/Logs/Schedule.hs b/Logs/Schedule.hs
index d2dd0c343..844781d50 100644
--- a/Logs/Schedule.hs
+++ b/Logs/Schedule.hs
@@ -22,7 +22,7 @@ import qualified Data.Set as S
 import Data.Time.Clock.POSIX
 import Data.Time.LocalTime
 
-import Common.Annex
+import Annex.Common
 import Types.ScheduledActivity
 import qualified Annex.Branch
 import Logs
diff --git a/Logs/SingleValue.hs b/Logs/SingleValue.hs
index 213bcd217..9b1306c98 100644
--- a/Logs/SingleValue.hs
+++ b/Logs/SingleValue.hs
@@ -13,7 +13,7 @@
 
 module Logs.SingleValue where
 
-import Common.Annex
+import Annex.Common
 import qualified Annex.Branch
 import Logs.TimeStamp
 
diff --git a/Logs/Transfer.hs b/Logs/Transfer.hs
index 43d097354..bd910cd55 100644
--- a/Logs/Transfer.hs
+++ b/Logs/Transfer.hs
@@ -9,10 +9,9 @@
 
 module Logs.Transfer where
 
-import Common.Annex
+import Annex.Common
 import Annex.Perms
 import qualified Git
-import Types.Key
 import Utility.Metered
 import Utility.Percentage
 import Utility.QuickCheck
diff --git a/Logs/Transitions.hs b/Logs/Transitions.hs
index 5ccfd7e8c..eb9fb433b 100644
--- a/Logs/Transitions.hs
+++ b/Logs/Transitions.hs
@@ -17,7 +17,7 @@ module Logs.Transitions where
 import Data.Time.Clock.POSIX
 import qualified Data.Set as S
 
-import Common.Annex
+import Annex.Common
 import Logs.TimeStamp
 
 transitionsLog :: FilePath
diff --git a/Logs/Trust.hs b/Logs/Trust.hs
index 3d8d7bbae..4f685be91 100644
--- a/Logs/Trust.hs
+++ b/Logs/Trust.hs
@@ -20,7 +20,7 @@ module Logs.Trust (
 import qualified Data.Map as M
 import Data.Default
 
-import Common.Annex
+import Annex.Common
 import Types.TrustLevel
 import qualified Annex
 import Logs
diff --git a/Logs/Trust/Basic.hs b/Logs/Trust/Basic.hs
index 30e8dfb58..da542d472 100644
--- a/Logs/Trust/Basic.hs
+++ b/Logs/Trust/Basic.hs
@@ -13,7 +13,7 @@ module Logs.Trust.Basic (
 
 import Data.Time.Clock.POSIX
 
-import Common.Annex
+import Annex.Common
 import Types.TrustLevel
 import qualified Annex.Branch
 import qualified Annex
diff --git a/Logs/Trust/Pure.hs b/Logs/Trust/Pure.hs
index d493db63c..74b7fd38c 100644
--- a/Logs/Trust/Pure.hs
+++ b/Logs/Trust/Pure.hs
@@ -7,7 +7,7 @@
 
 module Logs.Trust.Pure where
 
-import Common.Annex
+import Annex.Common
 import Types.TrustLevel
 import Logs.UUIDBased
 
diff --git a/Logs/UUID.hs b/Logs/UUID.hs
index 8bdf41b9a..60c8a2ef9 100644
--- a/Logs/UUID.hs
+++ b/Logs/UUID.hs
@@ -25,7 +25,7 @@ import qualified Data.Map as M
 import Data.Time.Clock.POSIX
 
 import Types.UUID
-import Common.Annex
+import Annex.Common
 import qualified Annex
 import qualified Annex.Branch
 import Logs
diff --git a/Logs/Unused.hs b/Logs/Unused.hs
index 7a12f186c..1035d1246 100644
--- a/Logs/Unused.hs
+++ b/Logs/Unused.hs
@@ -33,9 +33,8 @@ import qualified Data.Set as S
 import Data.Time.Clock.POSIX
 import Data.Time
 
-import Common.Annex
+import Annex.Common
 import qualified Annex
-import Types.Key
 import Utility.Tmp
 import Logs.TimeStamp
 
diff --git a/Logs/View.hs b/Logs/View.hs
index 5ba4bf7c2..00bdb3079 100644
--- a/Logs/View.hs
+++ b/Logs/View.hs
@@ -19,7 +19,7 @@ module Logs.View (
 	prop_branchView_legal,
 ) where
 
-import Common.Annex
+import Annex.Common
 import Types.View
 import Types.MetaData
 import qualified Git
diff --git a/Logs/Web.hs b/Logs/Web.hs
index 8e737893e..ba71cb17d 100644
--- a/Logs/Web.hs
+++ b/Logs/Web.hs
@@ -23,7 +23,7 @@ module Logs.Web (
 import qualified Data.ByteString.Lazy.Char8 as L
 import qualified Data.Map as M
 
-import Common.Annex
+import Annex.Common
 import qualified Annex
 import Logs
 import Logs.Presence