Always use filesystem encoding for all file and handle reads and writes.
This is a big scary change. I have convinced myself it should be safe. I hope!
This commit is contained in:
parent
c89a9e6ca5
commit
8484c0c197
48 changed files with 75 additions and 109 deletions
|
@ -14,6 +14,7 @@ import Build.Version (getChangelogVersion, Version)
|
|||
import Utility.UserInfo
|
||||
import Utility.Url
|
||||
import Utility.Tmp
|
||||
import Utility.FileSystemEncoding
|
||||
import qualified Git.Construct
|
||||
import qualified Annex
|
||||
import Annex.Content
|
||||
|
@ -50,6 +51,7 @@ autobuilds =
|
|||
|
||||
main :: IO ()
|
||||
main = do
|
||||
useFileSystemEncoding
|
||||
version <- liftIO getChangelogVersion
|
||||
repodir <- getRepoDir
|
||||
changeWorkingDirectory repodir
|
||||
|
|
|
@ -210,7 +210,6 @@ applySplices destdir imports splices@(first:_) = do
|
|||
when (oldcontent /= Just newcontent) $ do
|
||||
putStrLn $ "splicing " ++ f
|
||||
withFile dest WriteMode $ \h -> do
|
||||
fileEncoding h
|
||||
hPutStr h newcontent
|
||||
hClose h
|
||||
where
|
||||
|
@ -721,7 +720,9 @@ parsecAndReplace p s = case parse find "" s of
|
|||
find = many $ try (Right <$> p) <|> (Left <$> anyChar)
|
||||
|
||||
main :: IO ()
|
||||
main = go =<< getArgs
|
||||
main = do
|
||||
useFileSystemEncoding
|
||||
go =<< getArgs
|
||||
where
|
||||
go (destdir:log:header:[]) = run destdir log (Just header)
|
||||
go (destdir:log:[]) = run destdir log Nothing
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue