From 7d51b0c10937a59e15691940350c0da8c812f5b8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 3 Jan 2019 11:37:02 -0400 Subject: [PATCH] import Utility.FileSystemEncoding in Common --- Annex/Branch.hs | 1 - Annex/CatFile.hs | 1 - Annex/DirHashes.hs | 1 - Annex/Init.hs | 1 - Annex/Link.hs | 1 - Annex/Ssh.hs | 1 - Annex/UUID.hs | 1 - Annex/VariantFile.hs | 1 - Assistant/Threads/Watcher.hs | 1 - Backend/Utilities.hs | 1 - Command/AddUrl.hs | 1 - Common.hs | 1 + Git/CatFile.hs | 1 - Git/UnionMerge.hs | 1 - Logs/UUID.hs | 1 - Remote.hs | 1 - Remote/BitTorrent.hs | 1 - Remote/Helper/Encryptable.hs | 1 - Remote/S3.hs | 1 - Utility/DirWatcher/INotify.hs | 3 --- Utility/Metered.hs | 1 - 21 files changed, 1 insertion(+), 22 deletions(-) diff --git a/Annex/Branch.hs b/Annex/Branch.hs index e5777dc089..8a314a21d9 100644 --- a/Annex/Branch.hs +++ b/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. -} diff --git a/Annex/CatFile.hs b/Annex/CatFile.hs index d34bccb62d..fd6ac48bfe 100644 --- a/Annex/CatFile.hs +++ b/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 diff --git a/Annex/DirHashes.hs b/Annex/DirHashes.hs index 4991ad9ebc..74fe51d2e0 100644 --- a/Annex/DirHashes.hs +++ b/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 diff --git a/Annex/Init.hs b/Annex/Init.hs index 1b0d312fac..cb3dfd1c05 100644 --- a/Annex/Init.hs +++ b/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 diff --git a/Annex/Link.hs b/Annex/Link.hs index 4a5255bacd..7cca21bbf7 100644 --- a/Annex/Link.hs +++ b/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 diff --git a/Annex/Ssh.hs b/Annex/Ssh.hs index 99ef759de5..55384ade05 100644 --- a/Annex/Ssh.hs +++ b/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 diff --git a/Annex/UUID.hs b/Annex/UUID.hs index b65c98ace1..3e25b5b02c 100644 --- a/Annex/UUID.hs +++ b/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" diff --git a/Annex/VariantFile.hs b/Annex/VariantFile.hs index d623046d2c..228053da30 100644 --- a/Annex/VariantFile.hs +++ b/Annex/VariantFile.hs @@ -8,7 +8,6 @@ module Annex.VariantFile where import Annex.Common -import Utility.FileSystemEncoding import Utility.Hash variantMarker :: String diff --git a/Assistant/Threads/Watcher.hs b/Assistant/Threads/Watcher.hs index 742b8c88fa..1e676f2d8c 100644 --- a/Assistant/Threads/Watcher.hs +++ b/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 diff --git a/Backend/Utilities.hs b/Backend/Utilities.hs index adea26ac8b..6b31b8d12d 100644 --- a/Backend/Utilities.hs +++ b/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. diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs index f5e94ec082..ef6ea7e033 100644 --- a/Command/AddUrl.hs +++ b/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 diff --git a/Common.hs b/Common.hs index f637d463a6..877e69a483 100644 --- a/Common.hs +++ b/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 diff --git a/Git/CatFile.hs b/Git/CatFile.hs index d2e9bd3e0c..0aec9ff57c 100644 --- a/Git/CatFile.hs +++ b/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 diff --git a/Git/UnionMerge.hs b/Git/UnionMerge.hs index a9086f0e43..ebaaa6e74f 100644 --- a/Git/UnionMerge.hs +++ b/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. diff --git a/Logs/UUID.hs b/Logs/UUID.hs index 367551ac94..41ab7e69b9 100644 --- a/Logs/UUID.hs +++ b/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 diff --git a/Remote.hs b/Remote.hs index 49f000c6b8..33e679f204 100644 --- a/Remote.hs +++ b/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) diff --git a/Remote/BitTorrent.hs b/Remote/BitTorrent.hs index ab174defe7..4c8d7d946a 100644 --- a/Remote/BitTorrent.hs +++ b/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 diff --git a/Remote/Helper/Encryptable.hs b/Remote/Helper/Encryptable.hs index 38c7c0ce16..1729fbd493 100644 --- a/Remote/Helper/Encryptable.hs +++ b/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 diff --git a/Remote/S3.hs b/Remote/S3.hs index 7db850c3a6..46ea1b308b 100644 --- a/Remote/S3.hs +++ b/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(..)) diff --git a/Utility/DirWatcher/INotify.hs b/Utility/DirWatcher/INotify.hs index 3071c51205..8f87ce3771 100644 --- a/Utility/DirWatcher/INotify.hs +++ b/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 diff --git a/Utility/Metered.hs b/Utility/Metered.hs index 54153404ea..e1cf3d38c9 100644 --- a/Utility/Metered.hs +++ b/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