summaryrefslogtreecommitdiff
path: root/Git
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-06-17 16:17:09 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-06-17 16:48:00 -0400
commit3adf1ea63d9b5feccd4e6cb457fbbb52fdfc9fe0 (patch)
treebb68382446f50f6687dde96de1816d881bac655a /Git
parent9f375315d220169240e0e99a667601136b3e06e9 (diff)
fix failing quickcheck properties
QuickCheck 2.10 found a counterexample eg "\929184" broke the property. As far as I can tell, Git.Filename is matching how git handles encoding of strange high unicode characters in filenames for display. Git does not display high unicode characters, and instead displays the C-style escaped form of each byte. This is ambiguous, but since git is not unicode aware, it doesn't need to roundtrip parse it. So, making Git.FileName's roundtrip test only chars < 256 seems fine. Utility.Format.format uses encode_c, in order to mimic git, so that's ok. Utility.Format.gen uses decode_c, but only so that stuff like "\n" in the format string is handled. If the format string contains C-style octal escapes, they will be converted to ascii characters, and not combined into unicode characters, but that should not be a problem. If the user wants unicode characters, they can include them in the format string, without escaping them. Finally, decode_c is used by Utility.Gpg.secretKeys, because gpg --with-colons hex-escapes some characters in particular ':' and '\\'. gpg passes unicode through, so this use of decode_c is not a problem. This commit was sponsored by Henrik Riomar on Patreon.
Diffstat (limited to 'Git')
-rw-r--r--Git/Filename.hs14
1 files changed, 10 insertions, 4 deletions
diff --git a/Git/Filename.hs b/Git/Filename.hs
index ee84d4883..355e75f45 100644
--- a/Git/Filename.hs
+++ b/Git/Filename.hs
@@ -8,9 +8,10 @@
module Git.Filename where
+import Common
import Utility.Format (decode_c, encode_c)
-import Common
+import Data.Char
decode :: String -> FilePath
decode [] = []
@@ -23,6 +24,11 @@ decode f@(c:s)
encode :: FilePath -> String
encode s = "\"" ++ encode_c s ++ "\""
-{- for quickcheck -}
-prop_isomorphic_deencode :: String -> Bool
-prop_isomorphic_deencode s = s == decode (encode s)
+{- For quickcheck.
+ -
+ - See comment on Utility.Format.prop_encode_c_decode_c_roundtrip for
+ - why this only tests chars < 256 -}
+prop_encode_decode_roundtrip :: String -> Bool
+prop_encode_decode_roundtrip s = s' == decode (encode s')
+ where
+ s' = filter (\c -> ord c < 256) s