implement export.log and resolve export conflicts

Incremental export updates work now too.

This commit was sponsored by Anthony DeRobertis on Patreon.
This commit is contained in:
Joey Hess 2017-08-31 15:41:48 -04:00
parent bb08b1abd2
commit 978885247e
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
6 changed files with 126 additions and 40 deletions

View file

@ -42,6 +42,7 @@ topLevelUUIDBasedLogs =
, activityLog
, differenceLog
, multicastLog
, exportLog
]
{- All the ways to get a key from a presence log file -}
@ -97,6 +98,9 @@ differenceLog = "difference.log"
multicastLog :: FilePath
multicastLog = "multicast.log"
exportLog :: FilePath
exportLog = "export.log"
{- The pathname of the location log file for a given key. -}
locationLogFile :: GitConfig -> Key -> String
locationLogFile config key = branchHashDir config key </> keyFile key ++ ".log"