aboutsummaryrefslogtreecommitdiff
path: root/Logs/Difference
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-01-28 13:47:41 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-01-28 13:50:02 -0400
commitf351b887265f0abce8d52ffcb7b9b2ee7bd8bc81 (patch)
treec7cb719e91b82bee7f4ea8e74732dd3f3d4dc103 /Logs/Difference
parent6a8efb186432cd9b8fa7a61f8129303f5bcc9e1f (diff)
rework Differences data type
Eliminated complexity and future proofed. The most important change is that all functions over Difference are now total; any Difference that can be expressed should be handled. Avoids needs for sanity checking of inputs, and version skew with the future. Also, the difference.log now serializes a [Difference], not a Differences. This saves space and keeps it simpler. Note that [Difference] might contain conflicting differences (eg, [Version5, Version6]. In this case, one of them needs to consistently win over the others, probably based on Ord.
Diffstat (limited to 'Logs/Difference')
-rw-r--r--Logs/Difference/Pure.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Logs/Difference/Pure.hs b/Logs/Difference/Pure.hs
index 76d995a01..bbd4d348d 100644
--- a/Logs/Difference/Pure.hs
+++ b/Logs/Difference/Pure.hs
@@ -19,7 +19,7 @@ import Logs.UUIDBased
parseDifferencesLog :: String -> (M.Map UUID Differences)
parseDifferencesLog = simpleMap
- . parseLog (Just . fromMaybe UnknownDifferences . readish)
+ . parseLog (Just . maybe UnknownDifferences Differences . readish)
-- The sum of all recorded differences, across all UUIDs.
allDifferences :: M.Map UUID Differences -> Differences