summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-02-10 14:21:44 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-02-10 14:21:44 -0400
commitfe55b4644e67bba60b35e07abcdd312b65c9d6f3 (patch)
tree4631f428f86f72d614f9b5388772b6ec58a3fb8d /Command
parente7a3475704f5366e89aebe78cefbeb58ff5ab181 (diff)
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.
Diffstat (limited to 'Command')
-rw-r--r--Command/Find.hs3
-rw-r--r--Command/PreCommit.hs2
-rw-r--r--Command/Unused.hs2
3 files changed, 4 insertions, 3 deletions
diff --git a/Command/Find.hs b/Command/Find.hs
index 3ed15c153..45156af05 100644
--- a/Command/Find.hs
+++ b/Command/Find.hs
@@ -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
diff --git a/Command/PreCommit.hs b/Command/PreCommit.hs
index 12e5ed806..f22300a03 100644
--- a/Command/PreCommit.hs
+++ b/Command/PreCommit.hs
@@ -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
diff --git a/Command/Unused.hs b/Command/Unused.hs
index d9f4e3978..2b390b956 100644
--- a/Command/Unused.hs
+++ b/Command/Unused.hs
@@ -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)]