e213ef310f
* Fix minor FD leak in journal code. Closes: #754608 * direct: Fix handling of case where a work tree subdirectory cannot be written to due to permissions. * migrate: Avoid re-checksumming when migrating from hashE to hash backend. * uninit: Avoid failing final removal in some direct mode repositories due to file modes. * S3: Deal with AWS ACL configurations that do not allow creating or checking the location of a bucket, but only reading and writing content to it. * resolvemerge: New plumbing command that runs the automatic merge conflict resolver. * Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files. * sync: Fix git sync with local git remotes even when they don't have an annex.uuid set. (The assistant already did so.) * Set gcrypt-publish-participants when setting up a gcrypt repository, to avoid unncessary passphrase prompts. This is a security/usability tradeoff. To avoid exposing the gpg key ids who can decrypt the repository, users can unset gcrypt-publish-participants. * Install nautilus hooks even when ~/.local/share/nautilus/ does not yet exist, since it is not automatically created for Gnome 3 users. * Windows: Move .vbs files out of git\bin, to avoid that being in the PATH, which caused some weird breakage. (Thanks, divB) * Windows: Fix locking issue that prevented the webapp starting (since 5.20140707). # imported from the archive
93 lines
2.4 KiB
Haskell
93 lines
2.4 KiB
Haskell
{- git-annex uuid-based logs
|
|
-
|
|
- This is used to store information about a UUID in a way that can
|
|
- be union merged.
|
|
-
|
|
- A line of the log will look like: "UUID[ INFO[ timestamp=foo]]"
|
|
- The timestamp is last for backwards compatability reasons,
|
|
- and may not be present on old log lines.
|
|
-
|
|
- New uuid based logs instead use the form: "timestamp UUID INFO"
|
|
-
|
|
- Copyright 2011-2013 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
module Logs.UUIDBased (
|
|
Log,
|
|
LogEntry(..),
|
|
TimeStamp(..),
|
|
parseLog,
|
|
parseLogNew,
|
|
parseLogWithUUID,
|
|
showLog,
|
|
showLogNew,
|
|
changeLog,
|
|
addLog,
|
|
simpleMap,
|
|
) where
|
|
|
|
import qualified Data.Map as M
|
|
import Data.Time.Clock.POSIX
|
|
import Data.Time
|
|
import System.Locale
|
|
|
|
import Common
|
|
import Types.UUID
|
|
import Logs.MapLog
|
|
|
|
type Log v = MapLog UUID v
|
|
|
|
showLog :: (v -> String) -> Log v -> String
|
|
showLog shower = unlines . map showpair . M.toList
|
|
where
|
|
showpair (k, LogEntry (Date p) v) =
|
|
unwords [fromUUID k, shower v, tskey ++ show p]
|
|
showpair (k, LogEntry Unknown v) =
|
|
unwords [fromUUID k, shower v]
|
|
|
|
parseLog :: (String -> Maybe a) -> String -> Log a
|
|
parseLog = parseLogWithUUID . const
|
|
|
|
parseLogWithUUID :: (UUID -> String -> Maybe a) -> String -> Log a
|
|
parseLogWithUUID parser = M.fromListWith best . mapMaybe parse . lines
|
|
where
|
|
parse line
|
|
-- This is a workaround for a bug that caused
|
|
-- NoUUID items to be stored in the log.
|
|
-- It can be removed at any time; is just here to clean
|
|
-- up logs where that happened temporarily.
|
|
| " " `isPrefixOf` line = Nothing
|
|
| null ws = Nothing
|
|
| otherwise = parser u (unwords info) >>= makepair
|
|
where
|
|
makepair v = Just (u, LogEntry ts v)
|
|
ws = words line
|
|
u = toUUID $ Prelude.head ws
|
|
t = Prelude.last ws
|
|
ts
|
|
| tskey `isPrefixOf` t =
|
|
pdate $ drop 1 $ dropWhile (/= '=') t
|
|
| otherwise = Unknown
|
|
info
|
|
| ts == Unknown = drop 1 ws
|
|
| otherwise = drop 1 $ beginning ws
|
|
pdate s = case parseTime defaultTimeLocale "%s%Qs" s of
|
|
Nothing -> Unknown
|
|
Just d -> Date $ utcTimeToPOSIXSeconds d
|
|
|
|
showLogNew :: (v -> String) -> Log v -> String
|
|
showLogNew = showMapLog fromUUID
|
|
|
|
parseLogNew :: (String -> Maybe v) -> String -> Log v
|
|
parseLogNew = parseMapLog (Just . toUUID)
|
|
|
|
changeLog :: POSIXTime -> UUID -> v -> Log v -> Log v
|
|
changeLog = changeMapLog
|
|
|
|
addLog :: UUID -> LogEntry v -> Log v -> Log v
|
|
addLog = addMapLog
|
|
|
|
tskey :: String
|
|
tskey = "timestamp="
|