import Utility.FileSystemEncoding in Common

Annex/Branch.hs

@@ -65,7 +65,6 @@ import qualified Annex.Queue
 import Annex.Branch.Transitions
 import qualified Annex
 import Annex.Hook
-import Utility.FileSystemEncoding
 import Utility.Directory.Stream
 
 {- Name of the branch that is used to store git-annex's information. -}

Annex/CatFile.hs

@@ -38,7 +38,6 @@ import qualified Git.Ref
 import Annex.Link
 import Annex.CurrentBranch
 import Types.AdjustedBranch
-import Utility.FileSystemEncoding
 
 catFile :: Git.Branch -> FilePath -> Annex L.ByteString
 catFile branch file = do

Annex/DirHashes.hs

@@ -26,7 +26,6 @@ import Common
 import Key
 import Types.GitConfig
 import Types.Difference
-import Utility.FileSystemEncoding
 import Utility.Hash
 
 type Hasher = Key -> FilePath

Annex/Init.hs

@@ -45,7 +45,6 @@ import Annex.InodeSentinal
 import Upgrade
 import Annex.Perms
 import Utility.UserInfo
-import Utility.FileSystemEncoding
 #ifndef mingw32_HOST_OS
 import Utility.FileMode
 import System.Posix.User

Annex/Link.hs

@@ -30,7 +30,6 @@ import Git.FilePath
 import Annex.HashObject
 import Annex.InodeSentinal
 import Utility.FileMode
-import Utility.FileSystemEncoding
 import Utility.InodeCache
 import Utility.Tmp.Dir
 import Utility.CopyFile

Annex/Ssh.hs

@@ -32,7 +32,6 @@ import qualified Git.Url
 import Config
 import Annex.Path
 import Utility.Env
-import Utility.FileSystemEncoding
 import Utility.Hash
 import Types.CleanupActions
 import Types.Concurrency

Annex/UUID.hs

@@ -38,7 +38,6 @@ import qualified Data.UUID as U
 import qualified Data.UUID.V4 as U4
 import qualified Data.UUID.V5 as U5
 import Data.String
-import Utility.FileSystemEncoding
 
 configkey :: ConfigKey
 configkey = annexConfig "uuid"

Annex/VariantFile.hs

@@ -8,7 +8,6 @@
 module Annex.VariantFile where
 
 import Annex.Common
-import Utility.FileSystemEncoding
 import Utility.Hash
 
 variantMarker :: String

Assistant/Threads/Watcher.hs

@@ -44,7 +44,6 @@ import Git.FilePath
 import Config
 import Config.GitConfig
 import Utility.ThreadScheduler
-import Utility.FileSystemEncoding
 import Logs.Location
 import qualified Database.Keys
 #ifndef mingw32_HOST_OS

Backend/Utilities.hs

@@ -8,7 +8,6 @@
 module Backend.Utilities where
 
 import Annex.Common
-import Utility.FileSystemEncoding
 import Utility.Hash
 
 {- Generates a keyName from an input string. Takes care of sanitizing it.

Command/AddUrl.hs

@@ -28,7 +28,6 @@ import Types.UrlContents
 import Annex.FileMatcher
 import Logs.Location
 import Utility.Metered
-import Utility.FileSystemEncoding
 import Utility.HtmlDetect
 import Utility.Path.Max
 import qualified Annex.Transfer as Transfer

Common.hs

@@ -30,5 +30,6 @@ import Utility.Applicative as X
 import Utility.FileSize as X
 import Utility.Network as X
 import Utility.Split as X
+import Utility.FileSystemEncoding as X
 
 import Utility.PartialPrelude as X

Git/CatFile.hs

@@ -38,7 +38,6 @@ import Git.Types
 import Git.FilePath
 import Git.HashObject
 import qualified Utility.CoProcess as CoProcess
-import Utility.FileSystemEncoding
 import Utility.Tuple
 
 data CatFileHandle = CatFileHandle 

Git/UnionMerge.hs

@@ -22,7 +22,6 @@ import Git.UpdateIndex
 import Git.HashObject
 import Git.Types
 import Git.FilePath
-import Utility.FileSystemEncoding
 
 {- Performs a union merge between two branches, staging it in the index.
  - Any previously staged changes in the index will be lost.

Logs/UUID.hs

@@ -22,7 +22,6 @@ import qualified Annex.Branch
 import Logs
 import Logs.UUIDBased
 import qualified Annex.UUID
-import Utility.FileSystemEncoding
 
 import qualified Data.Map.Strict as M
 

Remote.hs

@@ -76,7 +76,6 @@ import Config
 import Config.DynamicConfig
 import Git.Types (RemoteName)
 import Utility.Aeson
-import Utility.FileSystemEncoding
 
 {- Map from UUIDs of Remotes to a calculated value. -}
 remoteMap :: (Remote -> v) -> Annex (M.Map UUID v)

Remote/BitTorrent.hs

@@ -22,7 +22,6 @@ import Types.CleanupActions
 import Messages.Progress
 import Utility.Metered
 import Utility.Tmp
-import Utility.FileSystemEncoding
 import Backend.URL
 import Annex.Perms
 import Annex.UUID

Remote/Helper/Encryptable.hs

@@ -29,7 +29,6 @@ import Config
 import Crypto
 import Types.Crypto
 import qualified Annex
-import Utility.FileSystemEncoding
 
 -- Used to ensure that encryption has been set up before trying to
 -- eg, store creds in the remote config that would need to use the

Remote/S3.hs

@@ -52,7 +52,6 @@ import Types.MetaData
 import Utility.Metered
 import qualified Annex.Url as Url
 import Utility.DataUnits
-import Utility.FileSystemEncoding
 import Annex.Content
 import Annex.Url (withUrlOptions)
 import Utility.Url (checkBoth, UrlOptions(..))

Utility/DirWatcher/INotify.hs

@@ -12,9 +12,6 @@ module Utility.DirWatcher.INotify where
 import Common hiding (isDirectory)
 import Utility.ThreadLock
 import Utility.DirWatcher.Types
-#if MIN_VERSION_hinotify(0,3,10)
-import Utility.FileSystemEncoding
-#endif
 
 import System.INotify
 import qualified System.Posix.Files as Files

Utility/Metered.hs

@@ -10,7 +10,6 @@
 module Utility.Metered where
 
 import Common
-import Utility.FileSystemEncoding
 import Utility.Percentage
 import Utility.DataUnits
 import Utility.HumanTime