diff options
Diffstat (limited to 'Logs/UUIDBased.hs')
| -rw-r--r-- | Logs/UUIDBased.hs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Logs/UUIDBased.hs b/Logs/UUIDBased.hs index fd1cd7c2d..4f32c19c7 100644 --- a/Logs/UUIDBased.hs +++ b/Logs/UUIDBased.hs @@ -35,7 +35,6 @@ import Common import Types.UUID import Annex.VectorClock import Logs.MapLog -import Logs.TimeStamp import Logs.Line type Log v = MapLog UUID v @@ -68,15 +67,12 @@ parseLogWithUUID parser = M.fromListWith best . mapMaybe parse . splitLines u = toUUID $ Prelude.head ws t = Prelude.last ws ts - | tskey `isPrefixOf` t = - pdate $ drop 1 $ dropWhile (/= '=') t + | tskey `isPrefixOf` t = fromMaybe Unknown $ + parseVectorClock $ drop 1 $ dropWhile (/= '=') t | otherwise = Unknown info | ts == Unknown = drop 1 ws | otherwise = drop 1 $ beginning ws - pdate s = case parsePOSIXTime s of - Nothing -> Unknown - Just d -> VectorClock d showLogNew :: (v -> String) -> Log v -> String showLogNew = showMapLog fromUUID |