Fix display of unicode filenames.

Internally, the filenames are stored as un-decoded unicode.
I tried decoding them, but then haskell tries to access the wrong files.
Hmm.

So, I've unhappily chosen option "B", which is to decode filenames before
they are displayed.
This commit is contained in:
Joey Hess 2011-02-10 14:21:44 -04:00
parent e7a3475704
commit fe55b4644e
11 changed files with 63 additions and 21 deletions

View file

@ -12,6 +12,7 @@ import Control.Monad.State (liftIO)
import Command
import Content
import Messages
command :: [Command]
command = [Command "find" (paramOptional $ paramRepeating paramPath) seek
@ -24,5 +25,5 @@ seek = [withFilesInGit start]
start :: CommandStartString
start file = isAnnexed file $ \(key, _) -> do
exists <- inAnnex key
when exists $ liftIO $ putStrLn file
when exists $ liftIO $ putStrLn $ showFile file
return Nothing

View file

@ -32,7 +32,7 @@ perform pair@(file, _) = do
ok <- doCommand $ Command.Add.start pair
if ok
then return $ Just $ cleanup file
else error $ "failed to add " ++ file ++ "; canceling commit"
else error $ "failed to add " ++ showFile file ++ "; canceling commit"
cleanup :: FilePath -> CommandCleanup
cleanup file = do

View file

@ -68,7 +68,7 @@ checkUnused = do
dropmsg = ["(To remove unwanted data: git-annex dropunused NUMBER)"]
table l = [" NUMBER KEY"] ++ map cols l
cols (n,k) = " " ++ pad 6 (show n) ++ " " ++ show k
cols (n,k) = " " ++ pad 6 (show n) ++ " " ++ (showFile . show) k
pad n s = s ++ replicate (n - length s) ' '
number :: Int -> [a] -> [(Int, a)]